Merge branch 'cpuidle/next' of https://git.linaro.org/people/daniel.l…

…ezcano/linux * 'cpuidle/next' of https://git.linaro.org/people/daniel.lezcano/linux: cpuidle: kirkwood: Convert to platform remove callback returning void
mariux64 · Apr 30, 2024 · 90bc39d · 90bc39d
2 parents ed30a4a + f9059eb
commit 90bc39d
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/drivers/cpuidle/cpuidle-kirkwood.c b/drivers/cpuidle/cpuidle-kirkwood.c
@@ -59,15 +59,14 @@ static int kirkwood_cpuidle_probe(struct platform_device *pdev)
 	return cpuidle_register(&kirkwood_idle_driver, NULL);
 }
 
-static int kirkwood_cpuidle_remove(struct platform_device *pdev)
+static void kirkwood_cpuidle_remove(struct platform_device *pdev)
 {
 	cpuidle_unregister(&kirkwood_idle_driver);
-	return 0;
 }
 
 static struct platform_driver kirkwood_cpuidle_driver = {
 	.probe = kirkwood_cpuidle_probe,
-	.remove = kirkwood_cpuidle_remove,
+	.remove_new = kirkwood_cpuidle_remove,
 	.driver = {
 		   .name = "kirkwood_cpuidle",
 		   },