net: bgmac: Fix return value check for fixed_phy_register()

[linux.git] / drivers / pwm / pwm-sti.c

diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index 44b1f93256b3683d86e5e45290e381bbb194cbc6..b1d1373648a38fb39cfa9f263ba53c13564a6f3b 100644 (file)
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -669,7 +669,7 @@ static int sti_pwm_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int sti_pwm_remove(struct platform_device *pdev)
+static void sti_pwm_remove(struct platform_device *pdev)
 {
        struct sti_pwm_chip *pc = platform_get_drvdata(pdev);
 
@@ -677,8 +677,6 @@ static int sti_pwm_remove(struct platform_device *pdev)
 
        clk_unprepare(pc->pwm_clk);
        clk_unprepare(pc->cpt_clk);
-
-       return 0;
 }
 
 static const struct of_device_id sti_pwm_of_match[] = {
@@ -693,7 +691,7 @@ static struct platform_driver sti_pwm_driver = {
                .of_match_table = sti_pwm_of_match,
        },
        .probe = sti_pwm_probe,
-       .remove = sti_pwm_remove,
+       .remove_new = sti_pwm_remove,
 };
 module_platform_driver(sti_pwm_driver);