diff options
| author | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 |
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/platform/x86/compal-laptop.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/compal-laptop.c')
| -rw-r--r-- | drivers/platform/x86/compal-laptop.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c index e10d2f64dfad..61c745490d71 100644 --- a/drivers/platform/x86/compal-laptop.c +++ b/drivers/platform/x86/compal-laptop.c @@ -1003,12 +1003,12 @@ remove: return err; } -static int compal_remove(struct platform_device *pdev) +static void compal_remove(struct platform_device *pdev) { struct compal_data *data; if (!extra_features) - return 0; + return; pr_info("Unloading: resetting fan control to motherboard\n"); pwm_disable_control(); @@ -1017,8 +1017,6 @@ static int compal_remove(struct platform_device *pdev) power_supply_unregister(data->psy); sysfs_remove_group(&pdev->dev.kobj, &compal_platform_attr_group); - - return 0; } static struct platform_driver compal_driver = { @@ -1026,7 +1024,7 @@ static struct platform_driver compal_driver = { .name = DRIVER_NAME, }, .probe = compal_probe, - .remove = compal_remove, + .remove_new = compal_remove, }; static int __init compal_init(void) |