diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2023-03-02 15:47:21 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2023-03-07 12:20:27 +0100 |
| commit | 63b890167e7f697a5e22d83d59a2717535ffb50b (patch) | |
| tree | 3679c1a303412730b6eaeb5f269b90f9009c0f9c /drivers | |
| parent | fba53497e3c0572a2d621bbd98615c6e07a9e518 (diff) | |
| download | linux-stable-63b890167e7f697a5e22d83d59a2717535ffb50b.tar.gz linux-stable-63b890167e7f697a5e22d83d59a2717535ffb50b.tar.bz2 linux-stable-63b890167e7f697a5e22d83d59a2717535ffb50b.zip | |
platform/x86: intel: hid: Convert to platform remove callback returning void
The .remove() callback for a platform driver returns an int which makes
many driver authors wrongly assume it's possible to do error handling by
returning an error code. However the value returned is (mostly) ignored
and this typically results in resource leaks. To improve here there is a
quest to make the remove callback return void. In the first step of this
quest all drivers are converted to .remove_new() which already returns
void.
Trivially convert this driver from always returning zero in the remove
callback to the void returning variant.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230302144732.1903781-19-u.kleine-koenig@pengutronix.de
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/x86/intel/hid.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c index b6c06b37862e..5632bd3c534a 100644 --- a/drivers/platform/x86/intel/hid.c +++ b/drivers/platform/x86/intel/hid.c @@ -720,7 +720,7 @@ err_remove_notify: return err; } -static int intel_hid_remove(struct platform_device *device) +static void intel_hid_remove(struct platform_device *device) { acpi_handle handle = ACPI_HANDLE(&device->dev); @@ -728,12 +728,6 @@ static int intel_hid_remove(struct platform_device *device) acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler); intel_hid_set_enable(&device->dev, false); intel_button_array_enable(&device->dev, false); - - /* - * Even if we failed to shut off the event stream, we can still - * safely detach from the device. - */ - return 0; } static struct platform_driver intel_hid_pl_driver = { @@ -743,7 +737,7 @@ static struct platform_driver intel_hid_pl_driver = { .pm = &intel_hid_pl_pm_ops, }, .probe = intel_hid_probe, - .remove = intel_hid_remove, + .remove_new = intel_hid_remove, }; /* |