ASoC: img: pistachio-internal-dac: Convert to platform remove callback returning...

[sfrench/cifs-2.6.git] / sound / soc / img / pistachio-internal-dac.c

diff --git a/sound/soc/img/pistachio-internal-dac.c b/sound/soc/img/pistachio-internal-dac.c
index e3b858643bd5d5e43941c17714b5535fd05b4e0e..da6251680e41484b02014ea266d9405bf0910257 100644 (file)
--- a/sound/soc/img/pistachio-internal-dac.c
+++ b/sound/soc/img/pistachio-internal-dac.c
@@ -215,15 +215,13 @@ err_regulator:
        return ret;
 }
 
-static int pistachio_internal_dac_remove(struct platform_device *pdev)
+static void pistachio_internal_dac_remove(struct platform_device *pdev)
 {
        struct pistachio_internal_dac *dac = dev_get_drvdata(&pdev->dev);
 
        pm_runtime_disable(&pdev->dev);
        pistachio_internal_dac_pwr_off(dac);
        regulator_disable(dac->supply);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM
@@ -273,7 +271,7 @@ static struct platform_driver pistachio_internal_dac_plat_driver = {
                .pm = &pistachio_internal_dac_pm_ops
        },
        .probe = pistachio_internal_dac_probe,
-       .remove = pistachio_internal_dac_remove
+       .remove_new = pistachio_internal_dac_remove
 };
 module_platform_driver(pistachio_internal_dac_plat_driver);