Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / pwm / pwm-img.c

diff --git a/drivers/pwm/pwm-img.c b/drivers/pwm/pwm-img.c
index 11b16ec..f97f825 100644 (file)
--- a/drivers/pwm/pwm-img.c
+++ b/drivers/pwm/pwm-img.c
@@ -326,28 +326,14 @@ err_pm_disable:
 static int img_pwm_remove(struct platform_device *pdev)
 {
        struct img_pwm_chip *pwm_chip = platform_get_drvdata(pdev);
-       u32 val;
-       unsigned int i;
-       int ret;
-
-       ret = pm_runtime_get_sync(&pdev->dev);
-       if (ret < 0) {
-               pm_runtime_put(&pdev->dev);
-               return ret;
-       }
-
-       for (i = 0; i < pwm_chip->chip.npwm; i++) {
-               val = img_pwm_readl(pwm_chip, PWM_CTRL_CFG);
-               val &= ~BIT(i);
-               img_pwm_writel(pwm_chip, PWM_CTRL_CFG, val);
-       }
 
-       pm_runtime_put(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
        if (!pm_runtime_status_suspended(&pdev->dev))
                img_pwm_runtime_suspend(&pdev->dev);
 
-       return pwmchip_remove(&pwm_chip->chip);
+       pwmchip_remove(&pwm_chip->chip);
+
+       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP