diff options
Diffstat (limited to 'sound/soc/nuc900')
-rw-r--r-- | sound/soc/nuc900/nuc900-ac97.c | 6 | ||||
-rw-r--r-- | sound/soc/nuc900/nuc900-pcm.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index 946020a647db..0418467a4848 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c | |||
@@ -314,7 +314,7 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = { | |||
314 | .ops = &nuc900_ac97_dai_ops, | 314 | .ops = &nuc900_ac97_dai_ops, |
315 | }; | 315 | }; |
316 | 316 | ||
317 | static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev) | 317 | static int nuc900_ac97_drvprobe(struct platform_device *pdev) |
318 | { | 318 | { |
319 | struct nuc900_audio *nuc900_audio; | 319 | struct nuc900_audio *nuc900_audio; |
320 | int ret; | 320 | int ret; |
@@ -382,7 +382,7 @@ out0: | |||
382 | return ret; | 382 | return ret; |
383 | } | 383 | } |
384 | 384 | ||
385 | static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev) | 385 | static int nuc900_ac97_drvremove(struct platform_device *pdev) |
386 | { | 386 | { |
387 | snd_soc_unregister_dai(&pdev->dev); | 387 | snd_soc_unregister_dai(&pdev->dev); |
388 | 388 | ||
@@ -403,7 +403,7 @@ static struct platform_driver nuc900_ac97_driver = { | |||
403 | .owner = THIS_MODULE, | 403 | .owner = THIS_MODULE, |
404 | }, | 404 | }, |
405 | .probe = nuc900_ac97_drvprobe, | 405 | .probe = nuc900_ac97_drvprobe, |
406 | .remove = __devexit_p(nuc900_ac97_drvremove), | 406 | .remove = nuc900_ac97_drvremove, |
407 | }; | 407 | }; |
408 | 408 | ||
409 | module_platform_driver(nuc900_ac97_driver); | 409 | module_platform_driver(nuc900_ac97_driver); |
diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c index 37585b47f4e3..c894ff0f2580 100644 --- a/sound/soc/nuc900/nuc900-pcm.c +++ b/sound/soc/nuc900/nuc900-pcm.c | |||
@@ -337,12 +337,12 @@ static struct snd_soc_platform_driver nuc900_soc_platform = { | |||
337 | .pcm_free = nuc900_dma_free_dma_buffers, | 337 | .pcm_free = nuc900_dma_free_dma_buffers, |
338 | }; | 338 | }; |
339 | 339 | ||
340 | static int __devinit nuc900_soc_platform_probe(struct platform_device *pdev) | 340 | static int nuc900_soc_platform_probe(struct platform_device *pdev) |
341 | { | 341 | { |
342 | return snd_soc_register_platform(&pdev->dev, &nuc900_soc_platform); | 342 | return snd_soc_register_platform(&pdev->dev, &nuc900_soc_platform); |
343 | } | 343 | } |
344 | 344 | ||
345 | static int __devexit nuc900_soc_platform_remove(struct platform_device *pdev) | 345 | static int nuc900_soc_platform_remove(struct platform_device *pdev) |
346 | { | 346 | { |
347 | snd_soc_unregister_platform(&pdev->dev); | 347 | snd_soc_unregister_platform(&pdev->dev); |
348 | return 0; | 348 | return 0; |
@@ -355,7 +355,7 @@ static struct platform_driver nuc900_pcm_driver = { | |||
355 | }, | 355 | }, |
356 | 356 | ||
357 | .probe = nuc900_soc_platform_probe, | 357 | .probe = nuc900_soc_platform_probe, |
358 | .remove = __devexit_p(nuc900_soc_platform_remove), | 358 | .remove = nuc900_soc_platform_remove, |
359 | }; | 359 | }; |
360 | 360 | ||
361 | module_platform_driver(nuc900_pcm_driver); | 361 | module_platform_driver(nuc900_pcm_driver); |