Merge branch 'for-6.5/apple' into for-linus

[J-linux.git] / drivers / pwm / pwm-hibvt.c

diff --git a/drivers/pwm/pwm-hibvt.c b/drivers/pwm/pwm-hibvt.c
index 1b9274c5ad8724c0419ea172266917c6568bdf42..b95df1a9612789250e7f90a15725db4a126e69a4 100644 (file)
--- a/drivers/pwm/pwm-hibvt.c
+++ b/drivers/pwm/pwm-hibvt.c
@@ -245,7 +245,7 @@ static int hibvt_pwm_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int hibvt_pwm_remove(struct platform_device *pdev)
+static void hibvt_pwm_remove(struct platform_device *pdev)
 {
        struct hibvt_pwm_chip *pwm_chip;
 
@@ -258,8 +258,6 @@ static int hibvt_pwm_remove(struct platform_device *pdev)
        reset_control_deassert(pwm_chip->rstc);
 
        clk_disable_unprepare(pwm_chip->clk);
-
-       return 0;
 }
 
 static const struct of_device_id hibvt_pwm_of_match[] = {
@@ -281,7 +279,7 @@ static struct platform_driver hibvt_pwm_driver = {
                .of_match_table = hibvt_pwm_of_match,
        },
        .probe = hibvt_pwm_probe,
-       .remove = hibvt_pwm_remove,
+       .remove_new = hibvt_pwm_remove,
 };
 module_platform_driver(hibvt_pwm_driver);