[PATCH 20/26] Input: maple_keyb - convert to devm
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2026-07-04 05:58:07
Also in:
linux-sh, lkml
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Dmitry Torokhov, Linus Torvalds
Convert the driver to use managed resources to simplify resource lifecycle management. This eliminates manual error handling in probe() and removes manual input device unregistration and memory freeing from remove(). Assisted-by: Antigravity:gemini-3.5-flash Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/keyboard/maple_keyb.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/drivers/input/keyboard/maple_keyb.c b/drivers/input/keyboard/maple_keyb.c
index aa9a4a80e26f..bd4ce803a13e 100644
--- a/drivers/input/keyboard/maple_keyb.c
+++ b/drivers/input/keyboard/maple_keyb.c@@ -155,17 +155,13 @@ static int probe_maple_kbd(struct maple_device *mdev) struct dc_kbd *kbd; struct input_dev *idev; - kbd = kzalloc_obj(*kbd); - if (!kbd) { - error = -ENOMEM; - goto fail; - } + kbd = devm_kzalloc(&mdev->dev, sizeof(*kbd), GFP_KERNEL); + if (!kbd) + return -ENOMEM; - idev = input_allocate_device(); - if (!idev) { - error = -ENOMEM; - goto fail_idev_alloc; - } + idev = devm_input_allocate_device(&mdev->dev); + if (!idev) + return -ENOMEM; kbd->dev = idev; memcpy(kbd->keycode, dc_kbd_keycode, sizeof(kbd->keycode));
@@ -179,7 +175,6 @@ static int probe_maple_kbd(struct maple_device *mdev) idev->keycodesize = sizeof(unsigned short); idev->keycodemax = ARRAY_SIZE(kbd->keycode); idev->id.bustype = BUS_HOST; - idev->dev.parent = &mdev->dev; idev->open = dc_kbd_open; idev->close = dc_kbd_close;
@@ -191,15 +186,9 @@ static int probe_maple_kbd(struct maple_device *mdev) error = input_register_device(idev); if (error) - goto fail_register; - return error; - -fail_register: - input_free_device(idev); -fail_idev_alloc: - kfree(kbd); -fail: - return error; + return error; + + return 0; }
--
2.55.0.rc0.799.gd6f94ed593-goog