Commit 90bc39d9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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

* 'cpuidle/next' of https://git.linaro.org/people/daniel.lezcano/linux:
  cpuidle: kirkwood: Convert to platform remove callback returning void
parents ed30a4a5 f9059eb5

drivers/cpuidle/cpuidle-kirkwood.c

+2 −3
Original line number Diff line number Diff line
@@ -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",

		   },