Merge tag 'fsnotify_for_v6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / pwm / pwm-tegra.c

diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c
index 249dc019329791b38fd2ff7fe30762cdbb4fec2e..5810abf66e2a48a9758d998c50e40574f47b7a10 100644 (file)
--- a/drivers/pwm/pwm-tegra.c
+++ b/drivers/pwm/pwm-tegra.c
@@ -350,7 +350,7 @@ put_pm:
        return ret;
 }
 
-static int tegra_pwm_remove(struct platform_device *pdev)
+static void tegra_pwm_remove(struct platform_device *pdev)
 {
        struct tegra_pwm_chip *pc = platform_get_drvdata(pdev);
 
@@ -359,8 +359,6 @@ static int tegra_pwm_remove(struct platform_device *pdev)
        reset_control_assert(pc->rst);
 
        pm_runtime_force_suspend(&pdev->dev);
-
-       return 0;
 }
 
 static int __maybe_unused tegra_pwm_runtime_suspend(struct device *dev)
@@ -434,7 +432,7 @@ static struct platform_driver tegra_pwm_driver = {
                .pm = &tegra_pwm_pm_ops,
        },
        .probe = tegra_pwm_probe,
-       .remove = tegra_pwm_remove,
+       .remove_new = tegra_pwm_remove,
 };
 
 module_platform_driver(tegra_pwm_driver);