diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-08-30 16:06:38 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-08-30 16:06:38 -0700 |
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/platform/x86/amilo-rfkill.c | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/platform/x86/amilo-rfkill.c')
| -rw-r--r-- | drivers/platform/x86/amilo-rfkill.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/platform/x86/amilo-rfkill.c b/drivers/platform/x86/amilo-rfkill.c index 3e313c4d538d3..efcf909786a52 100644 --- a/drivers/platform/x86/amilo-rfkill.c +++ b/drivers/platform/x86/amilo-rfkill.c @@ -124,11 +124,10 @@ fail: return rc; } -static int amilo_rfkill_remove(struct platform_device *device) +static void amilo_rfkill_remove(struct platform_device *device) { rfkill_unregister(amilo_rfkill_dev); rfkill_destroy(amilo_rfkill_dev); - return 0; } static struct platform_driver amilo_rfkill_driver = { @@ -136,7 +135,7 @@ static struct platform_driver amilo_rfkill_driver = { .name = KBUILD_MODNAME, }, .probe = amilo_rfkill_probe, - .remove = amilo_rfkill_remove, + .remove_new = amilo_rfkill_remove, }; static int __init amilo_rfkill_init(void) |