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

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

diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c
index ff82b56a886093e43c5456b14592452478d5d4a2..c8e73a7039348e7818b15bacb95b1e6e6268b856 100644 (file)
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
@@ -379,13 +379,13 @@ static struct snd_soc_dai_driver sh4_ssi_dai[] = {
 #endif
 };
 
-static int __devinit sh4_soc_dai_probe(struct platform_device *pdev)
+static int sh4_soc_dai_probe(struct platform_device *pdev)
 {
        return snd_soc_register_dais(&pdev->dev, sh4_ssi_dai,
                        ARRAY_SIZE(sh4_ssi_dai));
 }
 
-static int __devexit sh4_soc_dai_remove(struct platform_device *pdev)
+static int sh4_soc_dai_remove(struct platform_device *pdev)
 {
        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
        return 0;
@@ -398,7 +398,7 @@ static struct platform_driver sh4_ssi_driver = {
        },
 
        .probe = sh4_soc_dai_probe,
-       .remove = __devexit_p(sh4_soc_dai_remove),
+       .remove = sh4_soc_dai_remove,
 };
 
 module_platform_driver(sh4_ssi_driver);