Skip to content

Commit 8d53109

Browse files
Uwe Kleine-Königjwrdegoede
authored andcommitted
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>
1 parent 45ae16e commit 8d53109

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/platform/surface/surface3-wmi.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,13 @@ static int __init s3_wmi_probe(struct platform_device *pdev)
226226
return error;
227227
}
228228

229-
static int s3_wmi_remove(struct platform_device *device)
229+
static void s3_wmi_remove(struct platform_device *device)
230230
{
231231
/* remove the hotplug context from the acpi device */
232232
s3_wmi.touchscreen_adev->hp = NULL;
233233

234234
/* reinstall the actual PNPC0C0D LID default handle */
235235
acpi_bus_scan(s3_wmi.pnp0c0d_adev->handle);
236-
return 0;
237236
}
238237

239238
static int __maybe_unused s3_wmi_resume(struct device *dev)
@@ -248,7 +247,7 @@ static struct platform_driver s3_wmi_driver = {
248247
.name = "surface3-wmi",
249248
.pm = &s3_wmi_pm,
250249
},
251-
.remove = s3_wmi_remove,
250+
.remove_new = s3_wmi_remove,
252251
};
253252

254253
static int __init s3_wmi_init(void)

0 commit comments

Comments
 (0)