aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/jz4740/jz4740-i2s.c6
-rw-r--r--sound/soc/jz4740/jz4740-pcm.c6
-rw-r--r--sound/soc/jz4740/qi_lb60.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 41349670adab..6cef491f4823 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -425,7 +425,7 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = {
425 .resume = jz4740_i2s_resume, 425 .resume = jz4740_i2s_resume,
426}; 426};
427 427
428static int __devinit jz4740_i2s_dev_probe(struct platform_device *pdev) 428static int jz4740_i2s_dev_probe(struct platform_device *pdev)
429{ 429{
430 struct jz4740_i2s *i2s; 430 struct jz4740_i2s *i2s;
431 int ret; 431 int ret;
@@ -492,7 +492,7 @@ err_free:
492 return ret; 492 return ret;
493} 493}
494 494
495static int __devexit jz4740_i2s_dev_remove(struct platform_device *pdev) 495static int jz4740_i2s_dev_remove(struct platform_device *pdev)
496{ 496{
497 struct jz4740_i2s *i2s = platform_get_drvdata(pdev); 497 struct jz4740_i2s *i2s = platform_get_drvdata(pdev);
498 498
@@ -512,7 +512,7 @@ static int __devexit jz4740_i2s_dev_remove(struct platform_device *pdev)
512 512
513static struct platform_driver jz4740_i2s_driver = { 513static struct platform_driver jz4740_i2s_driver = {
514 .probe = jz4740_i2s_dev_probe, 514 .probe = jz4740_i2s_dev_probe,
515 .remove = __devexit_p(jz4740_i2s_dev_remove), 515 .remove = jz4740_i2s_dev_remove,
516 .driver = { 516 .driver = {
517 .name = "jz4740-i2s", 517 .name = "jz4740-i2s",
518 .owner = THIS_MODULE, 518 .owner = THIS_MODULE,
diff --git a/sound/soc/jz4740/jz4740-pcm.c b/sound/soc/jz4740/jz4740-pcm.c
index 9b8cf256847d..710059292318 100644
--- a/sound/soc/jz4740/jz4740-pcm.c
+++ b/sound/soc/jz4740/jz4740-pcm.c
@@ -335,12 +335,12 @@ static struct snd_soc_platform_driver jz4740_soc_platform = {
335 .pcm_free = jz4740_pcm_free, 335 .pcm_free = jz4740_pcm_free,
336}; 336};
337 337
338static int __devinit jz4740_pcm_probe(struct platform_device *pdev) 338static int jz4740_pcm_probe(struct platform_device *pdev)
339{ 339{
340 return snd_soc_register_platform(&pdev->dev, &jz4740_soc_platform); 340 return snd_soc_register_platform(&pdev->dev, &jz4740_soc_platform);
341} 341}
342 342
343static int __devexit jz4740_pcm_remove(struct platform_device *pdev) 343static int jz4740_pcm_remove(struct platform_device *pdev)
344{ 344{
345 snd_soc_unregister_platform(&pdev->dev); 345 snd_soc_unregister_platform(&pdev->dev);
346 return 0; 346 return 0;
@@ -348,7 +348,7 @@ static int __devexit jz4740_pcm_remove(struct platform_device *pdev)
348 348
349static struct platform_driver jz4740_pcm_driver = { 349static struct platform_driver jz4740_pcm_driver = {
350 .probe = jz4740_pcm_probe, 350 .probe = jz4740_pcm_probe,
351 .remove = __devexit_p(jz4740_pcm_remove), 351 .remove = jz4740_pcm_remove,
352 .driver = { 352 .driver = {
353 .name = "jz4740-pcm-audio", 353 .name = "jz4740-pcm-audio",
354 .owner = THIS_MODULE, 354 .owner = THIS_MODULE,
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
index e8aaff18d7cc..55fd6b5df55f 100644
--- a/sound/soc/jz4740/qi_lb60.c
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -96,7 +96,7 @@ static const struct gpio qi_lb60_gpios[] = {
96 { QI_LB60_AMP_GPIO, GPIOF_OUT_INIT_LOW, "AMP" }, 96 { QI_LB60_AMP_GPIO, GPIOF_OUT_INIT_LOW, "AMP" },
97}; 97};
98 98
99static int __devinit qi_lb60_probe(struct platform_device *pdev) 99static int qi_lb60_probe(struct platform_device *pdev)
100{ 100{
101 struct snd_soc_card *card = &qi_lb60; 101 struct snd_soc_card *card = &qi_lb60;
102 int ret; 102 int ret;
@@ -116,7 +116,7 @@ static int __devinit qi_lb60_probe(struct platform_device *pdev)
116 return ret; 116 return ret;
117} 117}
118 118
119static int __devexit qi_lb60_remove(struct platform_device *pdev) 119static int qi_lb60_remove(struct platform_device *pdev)
120{ 120{
121 struct snd_soc_card *card = platform_get_drvdata(pdev); 121 struct snd_soc_card *card = platform_get_drvdata(pdev);
122 122
@@ -131,7 +131,7 @@ static struct platform_driver qi_lb60_driver = {
131 .owner = THIS_MODULE, 131 .owner = THIS_MODULE,
132 }, 132 },
133 .probe = qi_lb60_probe, 133 .probe = qi_lb60_probe,
134 .remove = __devexit_p(qi_lb60_remove), 134 .remove = qi_lb60_remove,
135}; 135};
136 136
137module_platform_driver(qi_lb60_driver); 137module_platform_driver(qi_lb60_driver);