tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[PATCH] SPI controller build/warning fixes

The signature of the per-device cleanup() routine changed to remove its
const-ness. Three new SPI controller drivers now need that change, to
eliminate build warnings.

This also fixes a build bug with atmel_spi on AT91 systems.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

David Brownell and committed by
Linus Torvalds bb2d1c36 0bb92e6c

+8 -5
+5 -1
drivers/spi/atmel_spi.c
··· 23 23 #include <asm/arch/board.h> 24 24 #include <asm/arch/gpio.h> 25 25 26 + #ifdef CONFIG_ARCH_AT91 27 + #include <asm/arch/cpu.h> 28 + #endif 29 + 26 30 #include "atmel_spi.h" 27 31 28 32 /* ··· 495 491 return 0; 496 492 } 497 493 498 - static void atmel_spi_cleanup(const struct spi_device *spi) 494 + static void atmel_spi_cleanup(struct spi_device *spi) 499 495 { 500 496 if (spi->controller_state) 501 497 gpio_free((unsigned int)spi->controller_data);
+1 -1
drivers/spi/omap_uwire.c
··· 459 459 return uwire_setup_transfer(spi, NULL); 460 460 } 461 461 462 - static void uwire_cleanup(const struct spi_device *spi) 462 + static void uwire_cleanup(struct spi_device *spi) 463 463 { 464 464 kfree(spi->controller_state); 465 465 }
+2 -3
drivers/spi/spi_imx.c
··· 1361 1361 return status; 1362 1362 } 1363 1363 1364 - static void cleanup(const struct spi_device *spi) 1364 + static void cleanup(struct spi_device *spi) 1365 1365 { 1366 - struct chip_data *chip = spi_get_ctldata((struct spi_device *)spi); 1367 - kfree(chip); 1366 + kfree(spi_get_ctldata(spi)); 1368 1367 } 1369 1368 1370 1369 static int init_queue(struct driver_data *drv_data)