Merge branch 'cpuidle/next' of https://git.linaro.org/people/daniel.lezcano/linux

rafaeljw · rafaeljw · commit 90bc39d95408 · 2024-04-30T12:42:38.000+02:00
* 'cpuidle/next' of https://git.linaro.org/people/daniel.lezcano/linux: cpuidle: kirkwood: Convert to platform remove callback returning void
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",
 		   },

Original file line number	Diff line number	Diff line change
`@@ -59,15 +59,14 @@ static int kirkwood_cpuidle_probe(struct platform_device *pdev)`
`59`	`59`	`return cpuidle_register(&kirkwood_idle_driver, NULL);`
`60`	`60`	`}`
`61`	`61`
`62`		`-static int kirkwood_cpuidle_remove(struct platform_device *pdev)`
	`62`	`+static void kirkwood_cpuidle_remove(struct platform_device *pdev)`
`63`	`63`	`{`
`64`	`64`	`cpuidle_unregister(&kirkwood_idle_driver);`
`65`		`- return 0;`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`static struct platform_driver kirkwood_cpuidle_driver = {`
`69`	`68`	`.probe = kirkwood_cpuidle_probe,`
`70`		`- .remove = kirkwood_cpuidle_remove,`
	`69`	`+ .remove_new = kirkwood_cpuidle_remove,`
`71`	`70`	`.driver = {`
`72`	`71`	`.name = "kirkwood_cpuidle",`
`73`	`72`	`},`