diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-07 09:26:34 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:31:43 -0500 |
commit | d8628d1c824011dff9260f7e009c1bfed043c95e (patch) | |
tree | c29596e6f9beb0f04718daea05d33f4816140754 | |
parent | 4652a0d0c48324e1227e2b2500d17045840e2fb3 (diff) |
ASoC: txx9: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev*
markings will be going away.
Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/txx9/txx9aclc-ac97.c | 6 | ||||
-rw-r--r-- | sound/soc/txx9/txx9aclc.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index 28db4ca997ca..16ab69635e2e 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c | |||
@@ -170,7 +170,7 @@ static struct snd_soc_dai_driver txx9aclc_ac97_dai = { | |||
170 | }, | 170 | }, |
171 | }; | 171 | }; |
172 | 172 | ||
173 | static int __devinit txx9aclc_ac97_dev_probe(struct platform_device *pdev) | 173 | static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) |
174 | { | 174 | { |
175 | struct txx9aclc_plat_drvdata *drvdata; | 175 | struct txx9aclc_plat_drvdata *drvdata; |
176 | struct resource *r; | 176 | struct resource *r; |
@@ -208,7 +208,7 @@ static int __devinit txx9aclc_ac97_dev_probe(struct platform_device *pdev) | |||
208 | return snd_soc_register_dai(&pdev->dev, &txx9aclc_ac97_dai); | 208 | return snd_soc_register_dai(&pdev->dev, &txx9aclc_ac97_dai); |
209 | } | 209 | } |
210 | 210 | ||
211 | static int __devexit txx9aclc_ac97_dev_remove(struct platform_device *pdev) | 211 | static int txx9aclc_ac97_dev_remove(struct platform_device *pdev) |
212 | { | 212 | { |
213 | snd_soc_unregister_dai(&pdev->dev); | 213 | snd_soc_unregister_dai(&pdev->dev); |
214 | return 0; | 214 | return 0; |
@@ -216,7 +216,7 @@ static int __devexit txx9aclc_ac97_dev_remove(struct platform_device *pdev) | |||
216 | 216 | ||
217 | static struct platform_driver txx9aclc_ac97_driver = { | 217 | static struct platform_driver txx9aclc_ac97_driver = { |
218 | .probe = txx9aclc_ac97_dev_probe, | 218 | .probe = txx9aclc_ac97_dev_probe, |
219 | .remove = __devexit_p(txx9aclc_ac97_dev_remove), | 219 | .remove = txx9aclc_ac97_dev_remove, |
220 | .driver = { | 220 | .driver = { |
221 | .name = "txx9aclc-ac97", | 221 | .name = "txx9aclc-ac97", |
222 | .owner = THIS_MODULE, | 222 | .owner = THIS_MODULE, |
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c index b609d2c64c55..45a6428cba8d 100644 --- a/sound/soc/txx9/txx9aclc.c +++ b/sound/soc/txx9/txx9aclc.c | |||
@@ -417,12 +417,12 @@ static struct snd_soc_platform_driver txx9aclc_soc_platform = { | |||
417 | .pcm_free = txx9aclc_pcm_free_dma_buffers, | 417 | .pcm_free = txx9aclc_pcm_free_dma_buffers, |
418 | }; | 418 | }; |
419 | 419 | ||
420 | static int __devinit txx9aclc_soc_platform_probe(struct platform_device *pdev) | 420 | static int txx9aclc_soc_platform_probe(struct platform_device *pdev) |
421 | { | 421 | { |
422 | return snd_soc_register_platform(&pdev->dev, &txx9aclc_soc_platform); | 422 | return snd_soc_register_platform(&pdev->dev, &txx9aclc_soc_platform); |
423 | } | 423 | } |
424 | 424 | ||
425 | static int __devexit txx9aclc_soc_platform_remove(struct platform_device *pdev) | 425 | static int txx9aclc_soc_platform_remove(struct platform_device *pdev) |
426 | { | 426 | { |
427 | snd_soc_unregister_platform(&pdev->dev); | 427 | snd_soc_unregister_platform(&pdev->dev); |
428 | return 0; | 428 | return 0; |
@@ -435,7 +435,7 @@ static struct platform_driver txx9aclc_pcm_driver = { | |||
435 | }, | 435 | }, |
436 | 436 | ||
437 | .probe = txx9aclc_soc_platform_probe, | 437 | .probe = txx9aclc_soc_platform_probe, |
438 | .remove = __devexit_p(txx9aclc_soc_platform_remove), | 438 | .remove = txx9aclc_soc_platform_remove, |
439 | }; | 439 | }; |
440 | 440 | ||
441 | module_platform_driver(txx9aclc_pcm_driver); | 441 | module_platform_driver(txx9aclc_pcm_driver); |