Commit 4222272a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Hans de Goede

platform/x86: intel: vbtn: 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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230302144732.1903781-26-u.kleine-koenig@pengutronix.deReviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 2d58b009
...@@ -325,18 +325,12 @@ static int intel_vbtn_probe(struct platform_device *device) ...@@ -325,18 +325,12 @@ static int intel_vbtn_probe(struct platform_device *device)
return 0; return 0;
} }
static int intel_vbtn_remove(struct platform_device *device) static void intel_vbtn_remove(struct platform_device *device)
{ {
acpi_handle handle = ACPI_HANDLE(&device->dev); acpi_handle handle = ACPI_HANDLE(&device->dev);
device_init_wakeup(&device->dev, false); device_init_wakeup(&device->dev, false);
acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler); acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler);
/*
* Even if we failed to shut off the event stream, we can still
* safely detach from the device.
*/
return 0;
} }
static int intel_vbtn_pm_prepare(struct device *dev) static int intel_vbtn_pm_prepare(struct device *dev)
...@@ -377,7 +371,7 @@ static struct platform_driver intel_vbtn_pl_driver = { ...@@ -377,7 +371,7 @@ static struct platform_driver intel_vbtn_pl_driver = {
.pm = &intel_vbtn_pm_ops, .pm = &intel_vbtn_pm_ops,
}, },
.probe = intel_vbtn_probe, .probe = intel_vbtn_probe,
.remove = intel_vbtn_remove, .remove_new = intel_vbtn_remove,
}; };
static acpi_status __init static acpi_status __init
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment