aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-07 09:26:14 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-09 10:29:59 -0500
commitd7f1be84fb6f622e390d3ea392382aa9a541c087 (patch)
tree8265fdc23b4f556aad40f1723ec96de37a9aab8e /sound
parentdca66dab760b1a2abd9c577ba85ba051d79ee206 (diff)
ASoC: pxa/hx4700: 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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/pxa/hx4700.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index 2a342c92d829..dcc9b04bd92c 100644
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
@@ -183,7 +183,7 @@ static struct gpio hx4700_audio_gpios[] = {
183 { GPIO92_HX4700_HP_DRIVER, GPIOF_OUT_INIT_LOW, "EP_POWER" }, 183 { GPIO92_HX4700_HP_DRIVER, GPIOF_OUT_INIT_LOW, "EP_POWER" },
184}; 184};
185 185
186static int __devinit hx4700_audio_probe(struct platform_device *pdev) 186static int hx4700_audio_probe(struct platform_device *pdev)
187{ 187{
188 int ret; 188 int ret;
189 189
@@ -204,7 +204,7 @@ static int __devinit hx4700_audio_probe(struct platform_device *pdev)
204 return ret; 204 return ret;
205} 205}
206 206
207static int __devexit hx4700_audio_remove(struct platform_device *pdev) 207static int hx4700_audio_remove(struct platform_device *pdev)
208{ 208{
209 snd_soc_jack_free_gpios(&hs_jack, 1, &hs_jack_gpio); 209 snd_soc_jack_free_gpios(&hs_jack, 1, &hs_jack_gpio);
210 snd_soc_unregister_card(&snd_soc_card_hx4700); 210 snd_soc_unregister_card(&snd_soc_card_hx4700);
@@ -223,7 +223,7 @@ static struct platform_driver hx4700_audio_driver = {
223 .pm = &snd_soc_pm_ops, 223 .pm = &snd_soc_pm_ops,
224 }, 224 },
225 .probe = hx4700_audio_probe, 225 .probe = hx4700_audio_probe,
226 .remove = __devexit_p(hx4700_audio_remove), 226 .remove = hx4700_audio_remove,
227}; 227};
228 228
229module_platform_driver(hx4700_audio_driver); 229module_platform_driver(hx4700_audio_driver);