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

[karo-tx-linux.git] / sound / soc / codecs / wl1273.c

diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index 7b24d6d192e17d8cd5b61ade0d59988dde07c924..54cd3da09abd036471291901461331231ce78ab7 100644 (file)
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -485,13 +485,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wl1273 = {
        .remove = wl1273_remove,
 };
 
-static int __devinit wl1273_platform_probe(struct platform_device *pdev)
+static int wl1273_platform_probe(struct platform_device *pdev)
 {
        return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wl1273,
                                      &wl1273_dai, 1);
 }
 
-static int __devexit wl1273_platform_remove(struct platform_device *pdev)
+static int wl1273_platform_remove(struct platform_device *pdev)
 {
        snd_soc_unregister_codec(&pdev->dev);
        return 0;
@@ -505,7 +505,7 @@ static struct platform_driver wl1273_platform_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = wl1273_platform_probe,
-       .remove         = __devexit_p(wl1273_platform_remove),
+       .remove         = wl1273_platform_remove,
 };
 
 module_platform_driver(wl1273_platform_driver);