diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-07 09:26:27 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:31:26 -0500 |
| commit | fd582736aba64e0fe4995d47c4a1b1ade7600d74 (patch) | |
| tree | 588f30995ca68961710cdcb600d95a9def77a4e9 | |
| parent | 34e15fbdaa7b1839941d42c5fea96329a53be135 (diff) | |
ASoC: mxs: 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/mxs/mxs-pcm.c | 4 | ||||
| -rw-r--r-- | sound/soc/mxs/mxs-saif.c | 6 | ||||
| -rw-r--r-- | sound/soc/mxs/mxs-sgtl5000.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c index f82d766cbf9e..564b5b60319d 100644 --- a/sound/soc/mxs/mxs-pcm.c +++ b/sound/soc/mxs/mxs-pcm.c | |||
| @@ -220,13 +220,13 @@ static struct snd_soc_platform_driver mxs_soc_platform = { | |||
| 220 | .pcm_free = mxs_pcm_free, | 220 | .pcm_free = mxs_pcm_free, |
| 221 | }; | 221 | }; |
| 222 | 222 | ||
| 223 | int __devinit mxs_pcm_platform_register(struct device *dev) | 223 | int mxs_pcm_platform_register(struct device *dev) |
| 224 | { | 224 | { |
| 225 | return snd_soc_register_platform(dev, &mxs_soc_platform); | 225 | return snd_soc_register_platform(dev, &mxs_soc_platform); |
| 226 | } | 226 | } |
| 227 | EXPORT_SYMBOL_GPL(mxs_pcm_platform_register); | 227 | EXPORT_SYMBOL_GPL(mxs_pcm_platform_register); |
| 228 | 228 | ||
| 229 | void __devexit mxs_pcm_platform_unregister(struct device *dev) | 229 | void mxs_pcm_platform_unregister(struct device *dev) |
| 230 | { | 230 | { |
| 231 | snd_soc_unregister_platform(dev); | 231 | snd_soc_unregister_platform(dev); |
| 232 | } | 232 | } |
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index b304e375568a..365d9d27a321 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c | |||
| @@ -657,7 +657,7 @@ static irqreturn_t mxs_saif_irq(int irq, void *dev_id) | |||
| 657 | return IRQ_HANDLED; | 657 | return IRQ_HANDLED; |
| 658 | } | 658 | } |
| 659 | 659 | ||
| 660 | static int __devinit mxs_saif_probe(struct platform_device *pdev) | 660 | static int mxs_saif_probe(struct platform_device *pdev) |
| 661 | { | 661 | { |
| 662 | struct device_node *np = pdev->dev.of_node; | 662 | struct device_node *np = pdev->dev.of_node; |
| 663 | struct resource *iores, *dmares; | 663 | struct resource *iores, *dmares; |
| @@ -792,7 +792,7 @@ failed_pdev_alloc: | |||
| 792 | return ret; | 792 | return ret; |
| 793 | } | 793 | } |
| 794 | 794 | ||
| 795 | static int __devexit mxs_saif_remove(struct platform_device *pdev) | 795 | static int mxs_saif_remove(struct platform_device *pdev) |
| 796 | { | 796 | { |
| 797 | mxs_pcm_platform_unregister(&pdev->dev); | 797 | mxs_pcm_platform_unregister(&pdev->dev); |
| 798 | snd_soc_unregister_dai(&pdev->dev); | 798 | snd_soc_unregister_dai(&pdev->dev); |
| @@ -808,7 +808,7 @@ MODULE_DEVICE_TABLE(of, mxs_saif_dt_ids); | |||
| 808 | 808 | ||
| 809 | static struct platform_driver mxs_saif_driver = { | 809 | static struct platform_driver mxs_saif_driver = { |
| 810 | .probe = mxs_saif_probe, | 810 | .probe = mxs_saif_probe, |
| 811 | .remove = __devexit_p(mxs_saif_remove), | 811 | .remove = mxs_saif_remove, |
| 812 | 812 | ||
| 813 | .driver = { | 813 | .driver = { |
| 814 | .name = "mxs-saif", | 814 | .name = "mxs-saif", |
diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 215113b05f7d..b1d9b5ebeeeb 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c | |||
| @@ -112,7 +112,7 @@ static struct snd_soc_card mxs_sgtl5000 = { | |||
| 112 | .num_links = ARRAY_SIZE(mxs_sgtl5000_dai), | 112 | .num_links = ARRAY_SIZE(mxs_sgtl5000_dai), |
| 113 | }; | 113 | }; |
| 114 | 114 | ||
| 115 | static int __devinit mxs_sgtl5000_probe_dt(struct platform_device *pdev) | 115 | static int mxs_sgtl5000_probe_dt(struct platform_device *pdev) |
| 116 | { | 116 | { |
| 117 | struct device_node *np = pdev->dev.of_node; | 117 | struct device_node *np = pdev->dev.of_node; |
| 118 | struct device_node *saif_np[2], *codec_np; | 118 | struct device_node *saif_np[2], *codec_np; |
| @@ -145,7 +145,7 @@ static int __devinit mxs_sgtl5000_probe_dt(struct platform_device *pdev) | |||
| 145 | return ret; | 145 | return ret; |
| 146 | } | 146 | } |
| 147 | 147 | ||
| 148 | static int __devinit mxs_sgtl5000_probe(struct platform_device *pdev) | 148 | static int mxs_sgtl5000_probe(struct platform_device *pdev) |
| 149 | { | 149 | { |
| 150 | struct snd_soc_card *card = &mxs_sgtl5000; | 150 | struct snd_soc_card *card = &mxs_sgtl5000; |
| 151 | int ret; | 151 | int ret; |
| @@ -176,7 +176,7 @@ static int __devinit mxs_sgtl5000_probe(struct platform_device *pdev) | |||
| 176 | return 0; | 176 | return 0; |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | static int __devexit mxs_sgtl5000_remove(struct platform_device *pdev) | 179 | static int mxs_sgtl5000_remove(struct platform_device *pdev) |
| 180 | { | 180 | { |
| 181 | struct snd_soc_card *card = platform_get_drvdata(pdev); | 181 | struct snd_soc_card *card = platform_get_drvdata(pdev); |
| 182 | 182 | ||
| @@ -200,7 +200,7 @@ static struct platform_driver mxs_sgtl5000_audio_driver = { | |||
| 200 | .of_match_table = mxs_sgtl5000_dt_ids, | 200 | .of_match_table = mxs_sgtl5000_dt_ids, |
| 201 | }, | 201 | }, |
| 202 | .probe = mxs_sgtl5000_probe, | 202 | .probe = mxs_sgtl5000_probe, |
| 203 | .remove = __devexit_p(mxs_sgtl5000_remove), | 203 | .remove = mxs_sgtl5000_remove, |
| 204 | }; | 204 | }; |
| 205 | 205 | ||
| 206 | module_platform_driver(mxs_sgtl5000_audio_driver); | 206 | module_platform_driver(mxs_sgtl5000_audio_driver); |
