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

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

diff --git a/drivers/pwm/pwm-img.c b/drivers/pwm/pwm-img.c
index 89362afe3c91492c7b8dd389c43a67bc2af5575c..326af85888e7b4bd27f852d4bc62eaea080191c1 100644 (file)
--- a/drivers/pwm/pwm-img.c
+++ b/drivers/pwm/pwm-img.c
@@ -343,7 +343,7 @@ err_pm_disable:
        return ret;
 }
 
-static int img_pwm_remove(struct platform_device *pdev)
+static void img_pwm_remove(struct platform_device *pdev)
 {
        struct img_pwm_chip *imgchip = platform_get_drvdata(pdev);
 
@@ -352,8 +352,6 @@ static int img_pwm_remove(struct platform_device *pdev)
                img_pwm_runtime_suspend(&pdev->dev);
 
        pwmchip_remove(&imgchip->chip);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -423,7 +421,7 @@ static struct platform_driver img_pwm_driver = {
                .of_match_table = img_pwm_of_match,
        },
        .probe = img_pwm_probe,
-       .remove = img_pwm_remove,
+       .remove_new = img_pwm_remove,
 };
 module_platform_driver(img_pwm_driver);