Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[can-eth-gw-linux.git] / sound / soc / soc-utils.c

diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index 60053709e417b0bdcecc81d13ac676fc885021e7..fe4541df498cbd85eb4a10275a658ee15cdbab9b 100644 (file)
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -94,7 +94,7 @@ static struct snd_soc_dai_driver dummy_dai = {
        .name = "snd-soc-dummy-dai",
 };
 
-static __devinit int snd_soc_dummy_probe(struct platform_device *pdev)
+static int snd_soc_dummy_probe(struct platform_device *pdev)
 {
        int ret;
 
@@ -111,7 +111,7 @@ static __devinit int snd_soc_dummy_probe(struct platform_device *pdev)
        return ret;
 }
 
-static __devexit int snd_soc_dummy_remove(struct platform_device *pdev)
+static int snd_soc_dummy_remove(struct platform_device *pdev)
 {
        snd_soc_unregister_platform(&pdev->dev);
        snd_soc_unregister_codec(&pdev->dev);
@@ -125,7 +125,7 @@ static struct platform_driver soc_dummy_driver = {
                .owner = THIS_MODULE,
        },
        .probe = snd_soc_dummy_probe,
-       .remove = __devexit_p(snd_soc_dummy_remove),
+       .remove = snd_soc_dummy_remove,
 };
 
 static struct platform_device *soc_dummy_dev;