diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-06 12:35:12 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-07 01:21:54 -0500 |
commit | e21596bba143563cd8a2071ea0caff3256fad735 (patch) | |
tree | 13286d2f4ca658d78f2b1c6738dcb5de79ea65b6 /sound | |
parent | 6c9dc19c103b36da066c64a7758f5934f245f37d (diff) |
ALSA: pxa2xx: 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>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/arm/pxa2xx-ac97-lib.c | 2 | ||||
-rw-r--r-- | sound/arm/pxa2xx-ac97.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index 48d7c0aa5073..6fc0ae90e5b1 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c | |||
@@ -314,7 +314,7 @@ int pxa2xx_ac97_hw_resume(void) | |||
314 | EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume); | 314 | EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume); |
315 | #endif | 315 | #endif |
316 | 316 | ||
317 | int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) | 317 | int pxa2xx_ac97_hw_probe(struct platform_device *dev) |
318 | { | 318 | { |
319 | int ret; | 319 | int ret; |
320 | pxa2xx_audio_ops_t *pdata = dev->dev.platform_data; | 320 | pxa2xx_audio_ops_t *pdata = dev->dev.platform_data; |
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 4e1fda75c1c9..ec54be4efff0 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
@@ -163,7 +163,7 @@ static int pxa2xx_ac97_resume(struct device *dev) | |||
163 | static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume); | 163 | static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume); |
164 | #endif | 164 | #endif |
165 | 165 | ||
166 | static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) | 166 | static int pxa2xx_ac97_probe(struct platform_device *dev) |
167 | { | 167 | { |
168 | struct snd_card *card; | 168 | struct snd_card *card; |
169 | struct snd_ac97_bus *ac97_bus; | 169 | struct snd_ac97_bus *ac97_bus; |
@@ -224,7 +224,7 @@ err_dev: | |||
224 | return ret; | 224 | return ret; |
225 | } | 225 | } |
226 | 226 | ||
227 | static int __devexit pxa2xx_ac97_remove(struct platform_device *dev) | 227 | static int pxa2xx_ac97_remove(struct platform_device *dev) |
228 | { | 228 | { |
229 | struct snd_card *card = platform_get_drvdata(dev); | 229 | struct snd_card *card = platform_get_drvdata(dev); |
230 | 230 | ||
@@ -239,7 +239,7 @@ static int __devexit pxa2xx_ac97_remove(struct platform_device *dev) | |||
239 | 239 | ||
240 | static struct platform_driver pxa2xx_ac97_driver = { | 240 | static struct platform_driver pxa2xx_ac97_driver = { |
241 | .probe = pxa2xx_ac97_probe, | 241 | .probe = pxa2xx_ac97_probe, |
242 | .remove = __devexit_p(pxa2xx_ac97_remove), | 242 | .remove = pxa2xx_ac97_remove, |
243 | .driver = { | 243 | .driver = { |
244 | .name = "pxa2xx-ac97", | 244 | .name = "pxa2xx-ac97", |
245 | .owner = THIS_MODULE, | 245 | .owner = THIS_MODULE, |