platform/x86: xo15-ebook: Use devres-based resource management
Subsystems (2)
Rafael J. Wysocki
maintainerPATCH 1/1 platform/x86: xo15-ebook: Use devres-based resource management
From: "Rafael J. Wysocki" <[email protected]>
Use devm_kzalloc() and devm_input_allocate_device() in ebook_switch_probe() for allocating the button object and the input device, respectively, to simplify the rollback path in that function and ebook_switch_remove().
Signed-off-by Rafael J. Wysocki <[email protected]>
---
As promised, on top of
https://lore.kernel.org/linux-acpi/[email protected]/
--- drivers/platform/x86/xo15-ebook.c | 41 ++++++++++++-------------------------- 1 file changed, 14 insertions(+), 27 deletions(-)
drivers/platform/x86/xo15-ebook.c +14 -27
@@ -82,29 +82,29 @@ static SIMPLE_DEV_PM_OPS(ebook_switch_pmstatic int ebook_switch_probe (struct platform_device *pdev) { -struct acpi_device *device =ACPI_COMPANION (&pdev->dev); +struct device *dev = &pdev->dev; +struct acpi_device *device =ACPI_COMPANION (dev);const struct acpi_device_id *id;struct ebook_switch *button;struct input_dev *input;int error; - button = kzalloc_obj(struct ebook_switch); + button =devm_kzalloc (dev,sizeof (*button),GFP_KERNEL );if (!button)return -ENOMEM ;platform_set_drvdata (pdev, button); - button->input = input =input_allocate_device (); -if (!input) { - error = -ENOMEM ; - goto err_free_button; - } + input =devm_input_allocate_device (dev); +if (!input) +return -ENOMEM ; + + button->input = input; id =acpi_match_acpi_device (ebook_device_ids, device);if (!id) { -dev_err (&pdev->dev,"Unsupported hid\n" ); - error = -ENODEV ; - goto err_free_input; +dev_err (dev,"Unsupported hid\n" ); +return -ENODEV ; }strscpy (acpi_device_name (device),XO15_EBOOK_DEVICE_NAME );
@@ -115,21 +115,20 @@ static int ebook_switch_probe(struct pla input->name =acpi_device_name (device); input->phys = button->phys; input->id.bustype =BUS_HOST ; - input->dev.parent = &pdev->dev; input->evbit[0 ] =BIT_MASK (EV_SW );set_bit (SW_TABLET_MODE , input->swbit); error =input_register_device (input);if (error) - goto err_free_input; +return error; error =acpi_dev_install_notify_handler (device,ACPI_DEVICE_NOTIFY , - ebook_switch_notify, &pdev->dev); + ebook_switch_notify, dev);if (error) - goto err_unregister_input; +return error; -ebook_send_state (&pdev->dev); +ebook_send_state (dev);if (device->wakeup.flags.valid) {/* Button's GPE is run-wake GPE */
@@ -139,16 +138,6 @@ static int ebook_switch_probe(struct pla }return 0 ; - -err_free_input: -input_free_device (input); -err_free_button: -kfree (button); -return error; - -err_unregister_input: -input_unregister_device (input); - goto err_free_button; }static void ebook_switch_remove (struct platform_device *pdev)
@@ -162,8 +151,6 @@ static void ebook_switch_remove(struct pacpi_dev_remove_notify_handler (device,ACPI_DEVICE_NOTIFY , ebook_switch_notify); -input_unregister_device (button->input); -kfree (button); }static struct platform_driver xo15_ebook_driver = {
Quoted 4 lines · Rafael J. Wysocki
Use
devm_kzalloc()anddevm_input_allocate_device()inebook_switch_probe()for allocating the button object and the input device, respectively, to simplify the rollback path in that function andebook_switch_remove().
...
drivers/platform/x86/xo15-ebook.c static SIMPLE_DEV_PM_OPS(ebook_switch_pm · line 107
Quoted 7 lines
drivers/platform/x86/xo15-ebook.c +2
-3id =acpi_match_acpi_device (ebook_device_ids, device);if (!id) { -dev_err (&pdev->dev,"Unsupported hid\n" ); - error = -ENODEV ; - goto err_free_input; +dev_err (dev,"Unsupported hid\n" ); +return -ENODEV ;
Now we can use
return dev_err_probe(dev, -ENODEV, "Unsupported hid\n");
Quoted 1 line
}
Signature · 2 lines
With Best Regards, Andy Shevchenko