Skip to content

Commit 009faf9

Browse files
Uwe Kleine-KönigJiri Kosina
authored andcommitted
HID: surface-hid: kbd: 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() will be 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 <[email protected]> Reviewed-by: Maximilian Luz <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent afbc301 commit 009faf9

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/hid/surface-hid/surface_kbd.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,9 @@ static int surface_kbd_probe(struct platform_device *pdev)
271271
return surface_hid_device_add(shid);
272272
}
273273

274-
static int surface_kbd_remove(struct platform_device *pdev)
274+
static void surface_kbd_remove(struct platform_device *pdev)
275275
{
276276
surface_hid_device_destroy(platform_get_drvdata(pdev));
277-
return 0;
278277
}
279278

280279
static const struct acpi_device_id surface_kbd_match[] = {
@@ -285,7 +284,7 @@ MODULE_DEVICE_TABLE(acpi, surface_kbd_match);
285284

286285
static struct platform_driver surface_kbd_driver = {
287286
.probe = surface_kbd_probe,
288-
.remove = surface_kbd_remove,
287+
.remove_new = surface_kbd_remove,
289288
.driver = {
290289
.name = "surface_keyboard",
291290
.acpi_match_table = surface_kbd_match,

0 commit comments

Comments
 (0)