aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hans-peter.nilsson@axis.com>2007-02-12 03:52:45 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 12:48:31 -0500
commit0ffa0285052607513a29f529ddb5061c907fd8a6 (patch)
treed7072494d6d8005c60d42c1c841628c7d486dd9a /drivers
parent7f8c7619ea1ff5ab8e0b08c8120d629834ef4253 (diff)
[PATCH] SPI cleanup() method param becomes non-const
I'd like to assign NULL to kfree()d members of a structure. I can't do that without ugly casting (see the PXA patch) when the structure pointed to is const-qualified. I don't really see a reason why the cleanup method isn't allowed to alter the object it should clean up. :-) No, I didn't test the PXA patch, but I verified that the NULL-assignment doesn't stop me from doing rmmod/insmodding my own spi_bitbang-based driver. Signed-off-by: Hans-Peter Nilsson <hp@axis.com> 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')
-rw-r--r--drivers/spi/pxa2xx_spi.c4
-rw-r--r--drivers/spi/spi.c2
-rw-r--r--drivers/spi/spi_bitbang.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 8b41f9cc2560..9f2c887ffa04 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1214,9 +1214,9 @@ static int setup(struct spi_device *spi)
1214 return 0; 1214 return 0;
1215} 1215}
1216 1216
1217static void cleanup(const struct spi_device *spi) 1217static void cleanup(struct spi_device *spi)
1218{ 1218{
1219 struct chip_data *chip = spi_get_ctldata((struct spi_device *)spi); 1219 struct chip_data *chip = spi_get_ctldata(spi);
1220 1220
1221 kfree(chip); 1221 kfree(chip);
1222} 1222}
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 6307428d2c94..2328128728be 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -32,7 +32,7 @@
32 */ 32 */
33static void spidev_release(struct device *dev) 33static void spidev_release(struct device *dev)
34{ 34{
35 const struct spi_device *spi = to_spi_device(dev); 35 struct spi_device *spi = to_spi_device(dev);
36 36
37 /* spi masters may cleanup for released devices */ 37 /* spi masters may cleanup for released devices */
38 if (spi->master->cleanup) 38 if (spi->master->cleanup)
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index a5dadc74cee6..24a330d82395 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -238,7 +238,7 @@ EXPORT_SYMBOL_GPL(spi_bitbang_setup);
238/** 238/**
239 * spi_bitbang_cleanup - default cleanup for per-word I/O loops 239 * spi_bitbang_cleanup - default cleanup for per-word I/O loops
240 */ 240 */
241void spi_bitbang_cleanup(const struct spi_device *spi) 241void spi_bitbang_cleanup(struct spi_device *spi)
242{ 242{
243 kfree(spi->controller_state); 243 kfree(spi->controller_state);
244} 244}