ASoC: codecs: wm8997: Convert to platform remove callback returning void

[sfrench/cifs-2.6.git] / sound / soc / codecs / wm8997.c

diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index c0207e9a7d53a020343b8ff93f186fbeafed6808..87442840f0af20705bab7f1bf9d942b8cb2a31b5 100644 (file)
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -1193,7 +1193,7 @@ err_jack_codec_dev:
        return ret;
 }
 
-static int wm8997_remove(struct platform_device *pdev)
+static void wm8997_remove(struct platform_device *pdev)
 {
        struct wm8997_priv *wm8997 = platform_get_drvdata(pdev);
        struct arizona *arizona = wm8997->core.arizona;
@@ -1203,8 +1203,6 @@ static int wm8997_remove(struct platform_device *pdev)
        arizona_free_spk_irqs(arizona);
 
        arizona_jack_codec_dev_remove(&wm8997->core);
-
-       return 0;
 }
 
 static struct platform_driver wm8997_codec_driver = {
@@ -1212,7 +1210,7 @@ static struct platform_driver wm8997_codec_driver = {
                .name = "wm8997-codec",
        },
        .probe = wm8997_probe,
-       .remove = wm8997_remove,
+       .remove_new = wm8997_remove,
 };
 
 module_platform_driver(wm8997_codec_driver);