[PATCH 21/26] Input: maplemouse - convert to devm
Dmitry Torokhov <[email protected]> Fri, 03 Jul 2026 22:57:44 -0700
| Newsgroups | org.kernel.vger.linux-sh,org.infradead.lists.linux-mtd,org.kernel.vger.linux-input,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Convert the driver to use managed resources to simplify resource lifecycle management. This eliminates manual error handling in probe() and allows removing the remove() callback entirely, as all cleanup is handled automatically. Assisted-by: Antigravity:gemini-3.5-flash Signed-off-by: Dmitry Torokhov <[email protected]> --- drivers/input/mouse/maplemouse.c | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/drivers/input/mouse/maplemouse.c b/drivers/input/mouse/maplemouse.c index 03cb666d278d..7842bd46c9a1 100644 --- a/drivers/input/mouse/maplemouse.c +++ b/drivers/input/mouse/maplemouse.c @@ -70,17 +70,13 @@ static int probe_maple_mouse(struct maple_device *mdev) struct input_dev *input_dev; struct dc_mouse *mse; - mse = kzalloc_obj(*mse); - if (!mse) { - error = -ENOMEM; - goto fail; - } - - input_dev = input_allocate_device(); - if (!input_dev) { - error = -ENOMEM; - goto fail_nomem; - } + mse = devm_kzalloc(&mdev->dev, sizeof(*mse), GFP_KERNEL); + if (!mse) + return -ENOMEM; + + input_dev = devm_input_allocate_device(&mdev->dev); + if (!input_dev) + return -ENOMEM; mse->dev = input_dev; mse->mdev = mdev; @@ -99,29 +95,14 @@ static int probe_maple_mouse(struct maple_device *mdev) input_dev->id.bustype = BUS_HOST; error = input_register_device(input_dev); if (error) - goto fail_register; - return error; - -fail_register: - input_free_device(input_dev); -fail_nomem: - kfree(mse); -fail: - return error; -} + return error; -static void remove_maple_mouse(struct maple_device *mdev) -{ - struct dc_mouse *mse = maple_get_drvdata(mdev); - - input_unregister_device(mse->dev); - kfree(mse); + return 0; } static struct maple_driver dc_mouse_driver = { .function = MAPLE_FUNC_MOUSE, .probe = probe_maple_mouse, - .remove = remove_maple_mouse, .drv = { .name = "Dreamcast_mouse", }, -- 2.55.0.rc0.799.gd6f94ed593-goog