platform/x86: lg-laptop: Convert ACPI driver to a platform one

In all cases in which a struct acpi_driver is used for binding a driver
to an ACPI device object, a corresponding platform device is created by
the ACPI core and that device is regarded as a proper representation of
underlying hardware.  Accordingly, a struct platform_driver should be
used by driver code to bind to that device.  There are multiple reasons
why drivers should not bind directly to ACPI device objects [1].

Overall, it is better to bind drivers to platform devices than to their
ACPI companions, so convert the LG Gram ACPI features and hotkeys driver
from an ACPI driver to a platform one.

While this is not expected to alter functionality, it changes sysfs
layout and so it will be visible to user space.

Link: https://lore.kernel.org/all/2396510.ElGaqSPkdT@rafael.j.wysocki/
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/1868365.VLH7GnMWUR@rafael.j.wysocki
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c
index 7122d96abf86dcf51624d359129615b631281554..9681412d694beda5c61b2c28b44e35ed15bb4800 100644 (file)
--- a/drivers/platform/x86/lg-laptop.c
+++ b/drivers/platform/x86/lg-laptop.c
@@ -759,8 +759,9 @@ static void lg_laptop_remove_address_space_handler(void *data)
                                          &lg_laptop_address_space_handler);
 }
 
-static int acpi_add(struct acpi_device *device)
+static int acpi_probe(struct platform_device *pdev)
 {
+       struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
        struct platform_device_info pdev_info = {
                .fwnode = acpi_fwnode_handle(device),
                .name = PLATFORM_NAME,
@@ -776,11 +777,11 @@ static int acpi_add(struct acpi_device *device)
 
        status = acpi_install_address_space_handler(device->handle, LG_ADDRESS_SPACE_ID,
                                                    &lg_laptop_address_space_handler,
-                                                   NULL, &device->dev);
+                                                   NULL, &pdev->dev);
        if (ACPI_FAILURE(status))
                return -ENODEV;
 
-       ret = devm_add_action_or_reset(&device->dev, lg_laptop_remove_address_space_handler,
+       ret = devm_add_action_or_reset(&pdev->dev, lg_laptop_remove_address_space_handler,
                                       device);
        if (ret < 0)
                return ret;
@@ -874,7 +875,7 @@ out_platform_registered:
        return ret;
 }
 
-static void acpi_remove(struct acpi_device *device)
+static void acpi_remove(struct platform_device *pdev)
 {
        sysfs_remove_group(&pf_device->dev.kobj, &dev_attribute_group);
 
@@ -894,33 +895,13 @@ static const struct acpi_device_id device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, device_ids);
 
-static struct acpi_driver acpi_driver = {
-       .name = "LG Gram Laptop Support",
-       .class = "lg-laptop",
-       .ids = device_ids,
-       .ops = {
-               .add = acpi_add,
-               .remove = acpi_remove,
-               },
+static struct platform_driver acpi_driver = {
+       .probe = acpi_probe,
+       .remove = acpi_remove,
+       .driver = {
+               .name = "LG Gram Laptop Support",
+               .acpi_match_table = device_ids,
+       },
 };
 
-static int __init acpi_init(void)
-{
-       int result;
-
-       result = acpi_bus_register_driver(&acpi_driver);
-       if (result < 0) {
-               pr_debug("Error registering driver\n");
-               return -ENODEV;
-       }
-
-       return 0;
-}
-
-static void __exit acpi_exit(void)
-{
-       acpi_bus_unregister_driver(&acpi_driver);
-}
-
-module_init(acpi_init);
-module_exit(acpi_exit);
+module_platform_driver(acpi_driver);