mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
platform/surface: surface3-wmi: 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 ignored (apart from emitting a warning) 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. Eventually after all drivers are converted, .remove_new() is renamed to .remove(). 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> Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com> Link: https://lore.kernel.org/r/20230917203805.1149595-2-u.kleine-koenig@pengutronix.de Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
parent
45ae16ec3a
commit
8d53109dd6
1 changed files with 2 additions and 3 deletions
|
@ -226,14 +226,13 @@ static int __init s3_wmi_probe(struct platform_device *pdev)
|
|||
return error;
|
||||
}
|
||||
|
||||
static int s3_wmi_remove(struct platform_device *device)
|
||||
static void s3_wmi_remove(struct platform_device *device)
|
||||
{
|
||||
/* remove the hotplug context from the acpi device */
|
||||
s3_wmi.touchscreen_adev->hp = NULL;
|
||||
|
||||
/* reinstall the actual PNPC0C0D LID default handle */
|
||||
acpi_bus_scan(s3_wmi.pnp0c0d_adev->handle);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused s3_wmi_resume(struct device *dev)
|
||||
|
@ -248,7 +247,7 @@ static struct platform_driver s3_wmi_driver = {
|
|||
.name = "surface3-wmi",
|
||||
.pm = &s3_wmi_pm,
|
||||
},
|
||||
.remove = s3_wmi_remove,
|
||||
.remove_new = s3_wmi_remove,
|
||||
};
|
||||
|
||||
static int __init s3_wmi_init(void)
|
||||
|
|
Loading…
Add table
Reference in a new issue