diff options
| author | David Brownell <david-b@pacbell.net> | 2007-02-20 13:58:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 17:10:16 -0800 |
| commit | bb2d1c36c7f3a78d482622289c8de0c1a5fe790f (patch) | |
| tree | 1bb4dc9b173f500b4a130c05eae8ad080699597a /drivers/spi | |
| parent | 0bb92e6cd313cf209ea0c164952d1f65c5b3ea46 (diff) | |
| download | linux-3.10-bb2d1c36c7f3a78d482622289c8de0c1a5fe790f.tar.gz linux-3.10-bb2d1c36c7f3a78d482622289c8de0c1a5fe790f.tar.bz2 linux-3.10-bb2d1c36c7f3a78d482622289c8de0c1a5fe790f.zip | |
[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>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/atmel_spi.c | 6 | ||||
| -rw-r--r-- | drivers/spi/omap_uwire.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spi_imx.c | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index c2a9fef58ed..6fa260d1a9b 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -23,6 +23,10 @@ #include <asm/arch/board.h> #include <asm/arch/gpio.h> +#ifdef CONFIG_ARCH_AT91 +#include <asm/arch/cpu.h> +#endif + #include "atmel_spi.h" /* @@ -491,7 +495,7 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg) return 0; } -static void atmel_spi_cleanup(const struct spi_device *spi) +static void atmel_spi_cleanup(struct spi_device *spi) { if (spi->controller_state) gpio_free((unsigned int)spi->controller_data); diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c index 366af4959a0..96f62b2df30 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c @@ -459,7 +459,7 @@ static int uwire_setup(struct spi_device *spi) return uwire_setup_transfer(spi, NULL); } -static void uwire_cleanup(const struct spi_device *spi) +static void uwire_cleanup(struct spi_device *spi) { kfree(spi->controller_state); } diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 6ccf8a12a21..51daa212c6b 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c @@ -1361,10 +1361,9 @@ err_first_setup: return status; } -static void cleanup(const struct spi_device *spi) +static void cleanup(struct spi_device *spi) { - struct chip_data *chip = spi_get_ctldata((struct spi_device *)spi); - kfree(chip); + kfree(spi_get_ctldata(spi)); } static int init_queue(struct driver_data *drv_data) |