diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-04-30 12:42:38 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-04-30 12:42:38 +0200 |
| commit | 90bc39d954081667701969d9bafe95038e12b829 (patch) | |
| tree | d54a54d042c7110c2f5d5c2ad099e8d2ae101a00 /drivers | |
| parent | ed30a4a51bb196781c8058073ea720133a65596f (diff) | |
| parent | f9059eb5d73e65c88b88465abed4364dfc7b20b4 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpuidle/cpuidle-kirkwood.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/cpuidle/cpuidle-kirkwood.c b/drivers/cpuidle/cpuidle-kirkwood.c index 13bf743f885b..602c4dfdd7e2 100644 --- 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", }, |