diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-07 09:26:31 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:31:36 -0500 |
commit | bb5eb6ec2604c495805427b61a0ba0ff9d5b4aa9 (patch) | |
tree | 188890c590ca7e05a21b92f788dd79a23ef78a15 | |
parent | 9ac8a7122e17ccaaf35714f6d8d91ef2eae0e077 (diff) |
ASoC: sh: 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/sh/dma-sh7760.c | 6 | ||||
-rw-r--r-- | sound/soc/sh/hac.c | 6 | ||||
-rw-r--r-- | sound/soc/sh/siu_dai.c | 6 | ||||
-rw-r--r-- | sound/soc/sh/ssi.c | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index 7da20186b19e..19eff8fc4fdd 100644 --- a/sound/soc/sh/dma-sh7760.c +++ b/sound/soc/sh/dma-sh7760.c | |||
@@ -348,12 +348,12 @@ static struct snd_soc_platform sh7760_soc_platform = { | |||
348 | .pcm_free = camelot_pcm_free, | 348 | .pcm_free = camelot_pcm_free, |
349 | }; | 349 | }; |
350 | 350 | ||
351 | static int __devinit sh7760_soc_platform_probe(struct platform_device *pdev) | 351 | static int sh7760_soc_platform_probe(struct platform_device *pdev) |
352 | { | 352 | { |
353 | return snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform); | 353 | return snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform); |
354 | } | 354 | } |
355 | 355 | ||
356 | static int __devexit sh7760_soc_platform_remove(struct platform_device *pdev) | 356 | static int sh7760_soc_platform_remove(struct platform_device *pdev) |
357 | { | 357 | { |
358 | snd_soc_unregister_platform(&pdev->dev); | 358 | snd_soc_unregister_platform(&pdev->dev); |
359 | return 0; | 359 | return 0; |
@@ -366,7 +366,7 @@ static struct platform_driver sh7760_pcm_driver = { | |||
366 | }, | 366 | }, |
367 | 367 | ||
368 | .probe = sh7760_soc_platform_probe, | 368 | .probe = sh7760_soc_platform_probe, |
369 | .remove = __devexit_p(sh7760_soc_platform_remove), | 369 | .remove = sh7760_soc_platform_remove, |
370 | }; | 370 | }; |
371 | 371 | ||
372 | module_platform_driver(sh7760_pcm_driver); | 372 | module_platform_driver(sh7760_pcm_driver); |
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index 3474d7befe5a..4cc2d64ef476 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c | |||
@@ -310,13 +310,13 @@ static struct snd_soc_dai_driver sh4_hac_dai[] = { | |||
310 | #endif | 310 | #endif |
311 | }; | 311 | }; |
312 | 312 | ||
313 | static int __devinit hac_soc_platform_probe(struct platform_device *pdev) | 313 | static int hac_soc_platform_probe(struct platform_device *pdev) |
314 | { | 314 | { |
315 | return snd_soc_register_dais(&pdev->dev, sh4_hac_dai, | 315 | return snd_soc_register_dais(&pdev->dev, sh4_hac_dai, |
316 | ARRAY_SIZE(sh4_hac_dai)); | 316 | ARRAY_SIZE(sh4_hac_dai)); |
317 | } | 317 | } |
318 | 318 | ||
319 | static int __devexit hac_soc_platform_remove(struct platform_device *pdev) | 319 | static int hac_soc_platform_remove(struct platform_device *pdev) |
320 | { | 320 | { |
321 | snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_hac_dai)); | 321 | snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_hac_dai)); |
322 | return 0; | 322 | return 0; |
@@ -329,7 +329,7 @@ static struct platform_driver hac_pcm_driver = { | |||
329 | }, | 329 | }, |
330 | 330 | ||
331 | .probe = hac_soc_platform_probe, | 331 | .probe = hac_soc_platform_probe, |
332 | .remove = __devexit_p(hac_soc_platform_remove), | 332 | .remove = hac_soc_platform_remove, |
333 | }; | 333 | }; |
334 | 334 | ||
335 | module_platform_driver(hac_pcm_driver); | 335 | module_platform_driver(hac_pcm_driver); |
diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index 52d4c17b1232..34facdc9e4ac 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c | |||
@@ -726,7 +726,7 @@ static struct snd_soc_dai_driver siu_i2s_dai = { | |||
726 | .ops = &siu_dai_ops, | 726 | .ops = &siu_dai_ops, |
727 | }; | 727 | }; |
728 | 728 | ||
729 | static int __devinit siu_probe(struct platform_device *pdev) | 729 | static int siu_probe(struct platform_device *pdev) |
730 | { | 730 | { |
731 | const struct firmware *fw_entry; | 731 | const struct firmware *fw_entry; |
732 | struct resource *res, *region; | 732 | struct resource *res, *region; |
@@ -815,7 +815,7 @@ ereqfw: | |||
815 | return ret; | 815 | return ret; |
816 | } | 816 | } |
817 | 817 | ||
818 | static int __devexit siu_remove(struct platform_device *pdev) | 818 | static int siu_remove(struct platform_device *pdev) |
819 | { | 819 | { |
820 | struct siu_info *info = dev_get_drvdata(&pdev->dev); | 820 | struct siu_info *info = dev_get_drvdata(&pdev->dev); |
821 | struct resource *res; | 821 | struct resource *res; |
@@ -843,7 +843,7 @@ static struct platform_driver siu_driver = { | |||
843 | .name = "siu-pcm-audio", | 843 | .name = "siu-pcm-audio", |
844 | }, | 844 | }, |
845 | .probe = siu_probe, | 845 | .probe = siu_probe, |
846 | .remove = __devexit_p(siu_remove), | 846 | .remove = siu_remove, |
847 | }; | 847 | }; |
848 | 848 | ||
849 | module_platform_driver(siu_driver); | 849 | module_platform_driver(siu_driver); |
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index ff82b56a8860..c8e73a703934 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c | |||
@@ -379,13 +379,13 @@ static struct snd_soc_dai_driver sh4_ssi_dai[] = { | |||
379 | #endif | 379 | #endif |
380 | }; | 380 | }; |
381 | 381 | ||
382 | static int __devinit sh4_soc_dai_probe(struct platform_device *pdev) | 382 | static int sh4_soc_dai_probe(struct platform_device *pdev) |
383 | { | 383 | { |
384 | return snd_soc_register_dais(&pdev->dev, sh4_ssi_dai, | 384 | return snd_soc_register_dais(&pdev->dev, sh4_ssi_dai, |
385 | ARRAY_SIZE(sh4_ssi_dai)); | 385 | ARRAY_SIZE(sh4_ssi_dai)); |
386 | } | 386 | } |
387 | 387 | ||
388 | static int __devexit sh4_soc_dai_remove(struct platform_device *pdev) | 388 | static int sh4_soc_dai_remove(struct platform_device *pdev) |
389 | { | 389 | { |
390 | snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai)); | 390 | snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai)); |
391 | return 0; | 391 | return 0; |
@@ -398,7 +398,7 @@ static struct platform_driver sh4_ssi_driver = { | |||
398 | }, | 398 | }, |
399 | 399 | ||
400 | .probe = sh4_soc_dai_probe, | 400 | .probe = sh4_soc_dai_probe, |
401 | .remove = __devexit_p(sh4_soc_dai_remove), | 401 | .remove = sh4_soc_dai_remove, |
402 | }; | 402 | }; |
403 | 403 | ||
404 | module_platform_driver(sh4_ssi_driver); | 404 | module_platform_driver(sh4_ssi_driver); |