Merge tag 'rproc-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...

[platform/kernel/linux-starfive.git] / drivers / pwm / pwm-bcm2835.c

diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c
index 50b8594..bdfc2a5 100644 (file)
--- a/drivers/pwm/pwm-bcm2835.c
+++ b/drivers/pwm/pwm-bcm2835.c
@@ -173,15 +173,13 @@ add_fail:
        return ret;
 }
 
-static int bcm2835_pwm_remove(struct platform_device *pdev)
+static void bcm2835_pwm_remove(struct platform_device *pdev)
 {
        struct bcm2835_pwm *pc = platform_get_drvdata(pdev);
 
        pwmchip_remove(&pc->chip);
 
        clk_disable_unprepare(pc->clk);
-
-       return 0;
 }
 
 static const struct of_device_id bcm2835_pwm_of_match[] = {
@@ -196,7 +194,7 @@ static struct platform_driver bcm2835_pwm_driver = {
                .of_match_table = bcm2835_pwm_of_match,
        },
        .probe = bcm2835_pwm_probe,
-       .remove = bcm2835_pwm_remove,
+       .remove_new = bcm2835_pwm_remove,
 };
 module_platform_driver(bcm2835_pwm_driver);