Browse Source

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>
Mark Brown 11 years ago
parent
commit
67f08d690a
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/spi/spi-atmel.c

+ 2 - 2
drivers/spi/spi-atmel.c

@@ -1012,7 +1012,7 @@ static int atmel_spi_setup(struct spi_device *spi)
 	csr |= SPI_BF(DLYBCT, 0);
 	csr |= SPI_BF(DLYBCT, 0);
 
 
 	/* chipselect must have been muxed as GPIO (e.g. in board setup) */
 	/* 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))
 	if (gpio_is_valid(spi->cs_gpio))
 		npcs_pin = spi->cs_gpio;
 		npcs_pin = spi->cs_gpio;
@@ -1247,7 +1247,7 @@ msg_done:
 static void atmel_spi_cleanup(struct spi_device *spi)
 static void atmel_spi_cleanup(struct spi_device *spi)
 {
 {
 	struct atmel_spi_device	*asd = spi->controller_state;
 	struct atmel_spi_device	*asd = spi->controller_state;
-	unsigned		gpio = (unsigned) spi->controller_data;
+	unsigned		gpio = (unsigned long) spi->controller_data;
 
 
 	if (!asd)
 	if (!asd)
 		return;
 		return;