Skip to contentSkip to conversation

ASoC: samsung: Add __devexit_p at necessary places

PATCH Applied Axel Lin 2 participants 2 messages Oct 2, 2011

Subsystems (3)
Sound ASoC Samsung audio (ASoC) drivers
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Jaswinder Singh <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Seungwhan Youn <[email protected]>
Cc Jassi Brar <[email protected]>
---
 sound/soc/samsung/ac97.c        |    2 +-
 sound/soc/samsung/i2s.c         |    2 +-
 sound/soc/samsung/pcm.c         |    2 +-
 sound/soc/samsung/s3c2412-i2s.c |    2 +-
 sound/soc/samsung/s3c24xx-i2s.c |    2 +-
 sound/soc/samsung/spdif.c       |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
sound/soc/samsung/ac97.c +1 -1
index bc4e234..16521e3 100644
@@ -502,7 +502,7 @@ static __devexit int s3c_ac97_remove(struct platform_device *pdev)
 
 static struct platform_driver s3c_ac97_driver = {
 	.probe  = s3c_ac97_probe,
-	.remove = s3c_ac97_remove,
+	.remove = __devexit_p(s3c_ac97_remove),
 	.driver = {
 		.name = "samsung-ac97",
 		.owner = THIS_MODULE,
sound/soc/samsung/i2s.c +1 -1
index 79d4bce..bff42bf 100644
@@ -1137,7 +1137,7 @@ static __devexit int samsung_i2s_remove(struct platform_device *pdev)
 
 static struct platform_driver samsung_i2s_driver = {
 	.probe  = samsung_i2s_probe,
-	.remove = samsung_i2s_remove,
+	.remove = __devexit_p(samsung_i2s_remove),
 	.driver = {
 		.name = "samsung-i2s",
 		.owner = THIS_MODULE,
sound/soc/samsung/pcm.c +1 -1
index 4c191f0..05a47cf 100644
@@ -625,7 +625,7 @@ static __devexit int s3c_pcm_dev_remove(struct platform_device *pdev)
 
 static struct platform_driver s3c_pcm_driver = {
 	.probe  = s3c_pcm_dev_probe,
-	.remove = s3c_pcm_dev_remove,
+	.remove = __devexit_p(s3c_pcm_dev_remove),
 	.driver = {
 		.name = "samsung-pcm",
 		.owner = THIS_MODULE,
sound/soc/samsung/s3c2412-i2s.c +1 -1
index f01d4c4..7bbec25 100644
@@ -177,7 +177,7 @@ static __devexit int s3c2412_iis_dev_remove(struct platform_device *pdev)
 
 static struct platform_driver s3c2412_iis_driver = {
 	.probe  = s3c2412_iis_dev_probe,
-	.remove = s3c2412_iis_dev_remove,
+	.remove = __devexit_p(s3c2412_iis_dev_remove),
 	.driver = {
 		.name = "s3c2412-iis",
 		.owner = THIS_MODULE,
sound/soc/samsung/s3c24xx-i2s.c +1 -1
index c5a30d0..558c64b 100644
@@ -482,7 +482,7 @@ static __devexit int s3c24xx_iis_dev_remove(struct platform_device *pdev)
 
 static struct platform_driver s3c24xx_iis_driver = {
 	.probe  = s3c24xx_iis_dev_probe,
-	.remove = s3c24xx_iis_dev_remove,
+	.remove = __devexit_p(s3c24xx_iis_dev_remove),
 	.driver = {
 		.name = "s3c24xx-iis",
 		.owner = THIS_MODULE,
sound/soc/samsung/spdif.c +1 -1
index 7ca5bdc..965b2bd 100644
@@ -476,7 +476,7 @@ static __devexit int spdif_remove(struct platform_device *pdev)
 
 static struct platform_driver samsung_spdif_driver = {
 	.probe	= spdif_probe,
-	.remove	= spdif_remove,
+	.remove	= __devexit_p(spdif_remove),
 	.driver	= {
 		.name	= "samsung-spdif",
 		.owner	= THIS_MODULE,
Signature · 1 line
1.7.4.1
Applied
#1 lore raw
Quoted 1 line · Axel Lin

According to the comments in include/linux/init.h:

Applied, thanks.