Merge tag 'amd-drm-next-6.5-2023-06-09' of https://gitlab.freedesktop.org/agd5f/linux...

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

diff --git a/drivers/pwm/pwm-sprd.c b/drivers/pwm/pwm-sprd.c
index bde579a338c270323703e045976c9546a888b0fb..d43a6fa3f4e0446ab5d9ddc5e07809e87a9a8a15 100644 (file)
--- a/drivers/pwm/pwm-sprd.c
+++ b/drivers/pwm/pwm-sprd.c
@@ -280,13 +280,11 @@ static int sprd_pwm_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int sprd_pwm_remove(struct platform_device *pdev)
+static void sprd_pwm_remove(struct platform_device *pdev)
 {
        struct sprd_pwm_chip *spc = platform_get_drvdata(pdev);
 
        pwmchip_remove(&spc->chip);
-
-       return 0;
 }
 
 static const struct of_device_id sprd_pwm_of_match[] = {
@@ -301,7 +299,7 @@ static struct platform_driver sprd_pwm_driver = {
                .of_match_table = sprd_pwm_of_match,
        },
        .probe = sprd_pwm_probe,
-       .remove = sprd_pwm_remove,
+       .remove_new = sprd_pwm_remove,
 };
 
 module_platform_driver(sprd_pwm_driver);