summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-imx.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-08-23 09:34:43 -0400
committerMark Brown <broonie@kernel.org>2017-08-23 11:53:30 -0400
commit5904c9d3c9bd52f79718d1806175271b4bd20718 (patch)
treec484d32d708ae6ca34315c2b136c8d89e2fc34ad /drivers/spi/spi-imx.c
parent1673c81d9435bcf758da6ccaa291513e34c1cb82 (diff)
spi: imx: fix little-endian build
The newly added dynamic burst code produces a harmless warning on big-endian configurations: drivers/spi/spi-imx.c: In function 'spi_imx_buf_rx_swap_u32': drivers/spi/spi-imx.c:284:15: error: unused variable 'bytes_per_word' [-Werror=unused-variable] unsigned int bytes_per_word; ^~~~~~~~~~~~~~ drivers/spi/spi-imx.c: In function 'spi_imx_buf_tx_swap_u32': drivers/spi/spi-imx.c:319:15: error: unused variable 'bytes_per_word' [-Werror=unused-variable] unsigned int bytes_per_word; This adds another #ifdef around the variable declaration matching the one on the use. Fixes: 1673c81d9435 ("spi: imx: dynamic burst length adjust for PIO mode") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-imx.c')
-rw-r--r--drivers/spi/spi-imx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index cc808a1c765c..6fcb6adf9565 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -281,7 +281,9 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
281static void spi_imx_buf_rx_swap_u32(struct spi_imx_data *spi_imx) 281static void spi_imx_buf_rx_swap_u32(struct spi_imx_data *spi_imx)
282{ 282{
283 unsigned int val = readl(spi_imx->base + MXC_CSPIRXDATA); 283 unsigned int val = readl(spi_imx->base + MXC_CSPIRXDATA);
284#ifdef __LITTLE_ENDIAN
284 unsigned int bytes_per_word; 285 unsigned int bytes_per_word;
286#endif
285 287
286 if (spi_imx->rx_buf) { 288 if (spi_imx->rx_buf) {
287#ifdef __LITTLE_ENDIAN 289#ifdef __LITTLE_ENDIAN
@@ -316,7 +318,9 @@ static void spi_imx_buf_rx_swap(struct spi_imx_data *spi_imx)
316static void spi_imx_buf_tx_swap_u32(struct spi_imx_data *spi_imx) 318static void spi_imx_buf_tx_swap_u32(struct spi_imx_data *spi_imx)
317{ 319{
318 u32 val = 0; 320 u32 val = 0;
321#ifdef __LITTLE_ENDIAN
319 unsigned int bytes_per_word; 322 unsigned int bytes_per_word;
323#endif
320 324
321 if (spi_imx->tx_buf) { 325 if (spi_imx->tx_buf) {
322 val = *(u32 *)spi_imx->tx_buf; 326 val = *(u32 *)spi_imx->tx_buf;