diff options
| author | Mark Brown | 2014-08-01 18:43:03 +0200 |
|---|---|---|
| committer | Mark Brown | 2014-08-01 19:22:42 +0200 |
| commit | 67f08d690aa90e47a0e793fc63e2ecbe95d29839 (patch) | |
| tree | 7926d4c8eab1ee848145d64d089390e0a260698a | |
| parent | spi: atmel: Use dmaengine_prep_slave_sg() API (diff) | |
| download | kernel-qcow2-linux-67f08d690aa90e47a0e793fc63e2ecbe95d29839.tar.gz kernel-qcow2-linux-67f08d690aa90e47a0e793fc63e2ecbe95d29839.tar.xz kernel-qcow2-linux-67f08d690aa90e47a0e793fc63e2ecbe95d29839.zip | |
spi/atmel: Fix pointer to int conversion warnings on 64 bit builds
On 64 bit systems integers are generally still 32 bit but long values and
pointers are usually 64 bit. GCC warns when casting a 64 bit pointer into
a 32 bit integer so cast to a long instead in order to avoid warnings.
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/spi/spi-atmel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 1fb90dda299b..113c83f44b5c 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1012,7 +1012,7 @@ static int atmel_spi_setup(struct spi_device *spi) csr |= SPI_BF(DLYBCT, 0); /* chipselect must have been muxed as GPIO (e.g. in board setup) */ - npcs_pin = (unsigned int)spi->controller_data; + npcs_pin = (unsigned long)spi->controller_data; if (gpio_is_valid(spi->cs_gpio)) npcs_pin = spi->cs_gpio; @@ -1247,7 +1247,7 @@ msg_done: static void atmel_spi_cleanup(struct spi_device *spi) { struct atmel_spi_device *asd = spi->controller_state; - unsigned gpio = (unsigned) spi->controller_data; + unsigned gpio = (unsigned long) spi->controller_data; if (!asd) return; |