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/hp/hp_accel.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/hp/hp_accel.c')
| -rw-r--r-- | drivers/platform/x86/hp/hp_accel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/platform/x86/hp/hp_accel.c b/drivers/platform/x86/hp/hp_accel.c index 6477591747cfd..52535576772ad 100644 --- a/drivers/platform/x86/hp/hp_accel.c +++ b/drivers/platform/x86/hp/hp_accel.c @@ -342,7 +342,7 @@ static int lis3lv02d_probe(struct platform_device *device) return ret; } -static int lis3lv02d_remove(struct platform_device *device) +static void lis3lv02d_remove(struct platform_device *device) { i8042_remove_filter(hp_accel_i8042_filter); lis3lv02d_joystick_disable(&lis3_dev); @@ -352,7 +352,6 @@ static int lis3lv02d_remove(struct platform_device *device) flush_work(&hpled_led.work); lis3lv02d_remove_fs(&lis3_dev); - return 0; } static int __maybe_unused lis3lv02d_suspend(struct device *dev) @@ -373,7 +372,7 @@ static SIMPLE_DEV_PM_OPS(hp_accel_pm, lis3lv02d_suspend, lis3lv02d_resume); /* For the HP MDPS aka 3D Driveguard */ static struct platform_driver lis3lv02d_driver = { .probe = lis3lv02d_probe, - .remove = lis3lv02d_remove, + .remove_new = lis3lv02d_remove, .driver = { .name = "hp_accel", .pm = &hp_accel_pm, |