diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-10-01 23:20:13 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-02 14:58:44 -0400 |
commit | c4c5839f9828de60682802367013c1dd375c46cf (patch) | |
tree | 416a5c0fd65dd963306b1ac97d4d62876bab2ece /sound | |
parent | 48860e409dd4d333a953ac871b538a80d0ef068b (diff) |
ASoC: samsung: Add __devexit_p at necessary places
According to the comments in include/linux/init.h:
"Pointers to __devexit functions must use __devexit_p(function_name), the
wrapper will insert either the function_name or NULL, depending on the confi
options."
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Jaswinder Singh <jassi.brar@samsung.com>
Cc: Ben Dooks <ben@simtec.co.uk>
Cc: Seungwhan Youn <sw.youn@samsung.com>
Cc: Jassi Brar <jassisinghbrar@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/samsung/ac97.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/pcm.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/s3c2412-i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/spdif.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index f97110e72e8..65ea5388480 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c | |||
@@ -495,7 +495,7 @@ static __devexit int s3c_ac97_remove(struct platform_device *pdev) | |||
495 | 495 | ||
496 | static struct platform_driver s3c_ac97_driver = { | 496 | static struct platform_driver s3c_ac97_driver = { |
497 | .probe = s3c_ac97_probe, | 497 | .probe = s3c_ac97_probe, |
498 | .remove = s3c_ac97_remove, | 498 | .remove = __devexit_p(s3c_ac97_remove), |
499 | .driver = { | 499 | .driver = { |
500 | .name = "samsung-ac97", | 500 | .name = "samsung-ac97", |
501 | .owner = THIS_MODULE, | 501 | .owner = THIS_MODULE, |
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index c086b78539e..0c9ac20d222 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c | |||
@@ -1136,7 +1136,7 @@ static __devexit int samsung_i2s_remove(struct platform_device *pdev) | |||
1136 | 1136 | ||
1137 | static struct platform_driver samsung_i2s_driver = { | 1137 | static struct platform_driver samsung_i2s_driver = { |
1138 | .probe = samsung_i2s_probe, | 1138 | .probe = samsung_i2s_probe, |
1139 | .remove = samsung_i2s_remove, | 1139 | .remove = __devexit_p(samsung_i2s_remove), |
1140 | .driver = { | 1140 | .driver = { |
1141 | .name = "samsung-i2s", | 1141 | .name = "samsung-i2s", |
1142 | .owner = THIS_MODULE, | 1142 | .owner = THIS_MODULE, |
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 9c7e8b48aed..e55d7a5c4bd 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c | |||
@@ -624,7 +624,7 @@ static __devexit int s3c_pcm_dev_remove(struct platform_device *pdev) | |||
624 | 624 | ||
625 | static struct platform_driver s3c_pcm_driver = { | 625 | static struct platform_driver s3c_pcm_driver = { |
626 | .probe = s3c_pcm_dev_probe, | 626 | .probe = s3c_pcm_dev_probe, |
627 | .remove = s3c_pcm_dev_remove, | 627 | .remove = __devexit_p(s3c_pcm_dev_remove), |
628 | .driver = { | 628 | .driver = { |
629 | .name = "samsung-pcm", | 629 | .name = "samsung-pcm", |
630 | .owner = THIS_MODULE, | 630 | .owner = THIS_MODULE, |
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 7ab8e2c2921..f26a8bfb235 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c | |||
@@ -176,7 +176,7 @@ static __devexit int s3c2412_iis_dev_remove(struct platform_device *pdev) | |||
176 | 176 | ||
177 | static struct platform_driver s3c2412_iis_driver = { | 177 | static struct platform_driver s3c2412_iis_driver = { |
178 | .probe = s3c2412_iis_dev_probe, | 178 | .probe = s3c2412_iis_dev_probe, |
179 | .remove = s3c2412_iis_dev_remove, | 179 | .remove = __devexit_p(s3c2412_iis_dev_remove), |
180 | .driver = { | 180 | .driver = { |
181 | .name = "s3c2412-iis", | 181 | .name = "s3c2412-iis", |
182 | .owner = THIS_MODULE, | 182 | .owner = THIS_MODULE, |
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 21c92e2e300..c08117e658d 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c | |||
@@ -481,7 +481,7 @@ static __devexit int s3c24xx_iis_dev_remove(struct platform_device *pdev) | |||
481 | 481 | ||
482 | static struct platform_driver s3c24xx_iis_driver = { | 482 | static struct platform_driver s3c24xx_iis_driver = { |
483 | .probe = s3c24xx_iis_dev_probe, | 483 | .probe = s3c24xx_iis_dev_probe, |
484 | .remove = s3c24xx_iis_dev_remove, | 484 | .remove = __devexit_p(s3c24xx_iis_dev_remove), |
485 | .driver = { | 485 | .driver = { |
486 | .name = "s3c24xx-iis", | 486 | .name = "s3c24xx-iis", |
487 | .owner = THIS_MODULE, | 487 | .owner = THIS_MODULE, |
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 28c491dacf7..c82b47152b7 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c | |||
@@ -475,7 +475,7 @@ static __devexit int spdif_remove(struct platform_device *pdev) | |||
475 | 475 | ||
476 | static struct platform_driver samsung_spdif_driver = { | 476 | static struct platform_driver samsung_spdif_driver = { |
477 | .probe = spdif_probe, | 477 | .probe = spdif_probe, |
478 | .remove = spdif_remove, | 478 | .remove = __devexit_p(spdif_remove), |
479 | .driver = { | 479 | .driver = { |
480 | .name = "samsung-spdif", | 480 | .name = "samsung-spdif", |
481 | .owner = THIS_MODULE, | 481 | .owner = THIS_MODULE, |