platform/x86: classmate-laptop: Convert accel 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 cmpc_accel_acpi_driver in the Classmate
laptop driver from an ACPI driver to a platform one.

After this change, the input device registered by the driver will
appear under the platform device used for driver binding, but the sysfs
attribute added by the driver under the ACPI companion of that device
will stay there in case there are utilities in user space expecting
it to be present there.

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>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Link: https://patch.msgid.link/24365138.6Emhk5qWAg@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/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c
index 454ba2823b51a2bcdcb514399f935180ae6aebb0..0d5ad89d0f24db66fa3769cb7c893c0baa43c991 100644 (file)
--- a/drivers/platform/x86/classmate-laptop.c
+++ b/drivers/platform/x86/classmate-laptop.c
@@ -558,15 +558,15 @@ static acpi_status cmpc_get_accel(acpi_handle handle,
 
 static void cmpc_accel_handler(acpi_handle handle, u32 event, void *data)
 {
-       struct acpi_device *dev = data;
+       struct device *dev = data;
 
        if (event == 0x81) {
                unsigned char x, y, z;
                acpi_status status;
 
-               status = cmpc_get_accel(dev->handle, &x, &y, &z);
+               status = cmpc_get_accel(ACPI_HANDLE(dev), &x, &y, &z);
                if (ACPI_SUCCESS(status)) {
-                       struct input_dev *inputdev = dev_get_drvdata(&dev->dev);
+                       struct input_dev *inputdev = dev_get_drvdata(dev);
 
                        input_report_abs(inputdev, ABS_X, x);
                        input_report_abs(inputdev, ABS_Y, y);
@@ -633,20 +633,14 @@ static struct device_attribute cmpc_accel_sensitivity_attr = {
 
 static int cmpc_accel_open(struct input_dev *input)
 {
-       struct acpi_device *acpi;
-
-       acpi = to_acpi_device(input->dev.parent);
-       if (ACPI_SUCCESS(cmpc_start_accel(acpi->handle)))
+       if (ACPI_SUCCESS(cmpc_start_accel(ACPI_HANDLE(input->dev.parent))))
                return 0;
        return -EIO;
 }
 
 static void cmpc_accel_close(struct input_dev *input)
 {
-       struct acpi_device *acpi;
-
-       acpi = to_acpi_device(input->dev.parent);
-       cmpc_stop_accel(acpi->handle);
+       cmpc_stop_accel(ACPI_HANDLE(input->dev.parent));
 }
 
 static void cmpc_accel_idev_init(struct input_dev *inputdev)
@@ -659,21 +653,27 @@ static void cmpc_accel_idev_init(struct input_dev *inputdev)
        inputdev->close = cmpc_accel_close;
 }
 
-static int cmpc_accel_add(struct acpi_device *acpi)
+static int cmpc_accel_probe(struct platform_device *pdev)
 {
        int error;
        struct input_dev *inputdev;
        struct cmpc_accel *accel;
+       struct acpi_device *acpi;
 
-       accel = devm_kzalloc(&acpi->dev, sizeof(*accel), GFP_KERNEL);
+       acpi = ACPI_COMPANION(&pdev->dev);
+       if (!acpi)
+               return -ENODEV;
+
+       accel = devm_kzalloc(&pdev->dev, sizeof(*accel), GFP_KERNEL);
        if (!accel)
                return -ENOMEM;
 
-       error = cmpc_add_notify_device(&acpi->dev, "cmpc_accel", cmpc_accel_idev_init);
+       error = cmpc_add_notify_device(&pdev->dev, "cmpc_accel", cmpc_accel_idev_init);
        if (error)
                return error;
 
-       inputdev = dev_get_drvdata(&acpi->dev);
+       inputdev = dev_get_drvdata(&pdev->dev);
+       dev_set_drvdata(&acpi->dev, inputdev);
 
        accel->sensitivity = CMPC_ACCEL_SENSITIVITY_DEFAULT;
        cmpc_accel_set_sensitivity(acpi->handle, accel->sensitivity);
@@ -683,7 +683,7 @@ static int cmpc_accel_add(struct acpi_device *acpi)
                goto failed_file;
 
        error = acpi_dev_install_notify_handler(acpi, ACPI_DEVICE_NOTIFY,
-                                               cmpc_accel_handler, acpi);
+                                               cmpc_accel_handler, &pdev->dev);
        if (error)
                goto failed_notify_handler;
 
@@ -694,16 +694,20 @@ static int cmpc_accel_add(struct acpi_device *acpi)
 failed_notify_handler:
        device_remove_file(&acpi->dev, &cmpc_accel_sensitivity_attr);
 failed_file:
-       cmpc_remove_notify_device(&acpi->dev);
+       dev_set_drvdata(&acpi->dev, NULL);
+       cmpc_remove_notify_device(&pdev->dev);
        return error;
 }
 
-static void cmpc_accel_remove(struct acpi_device *acpi)
+static void cmpc_accel_remove(struct platform_device *pdev)
 {
+       struct acpi_device *acpi = ACPI_COMPANION(&pdev->dev);
+
        acpi_dev_remove_notify_handler(acpi, ACPI_DEVICE_NOTIFY,
                                       cmpc_accel_handler);
        device_remove_file(&acpi->dev, &cmpc_accel_sensitivity_attr);
-       cmpc_remove_notify_device(&acpi->dev);
+       dev_set_drvdata(&acpi->dev, NULL);
+       cmpc_remove_notify_device(&pdev->dev);
 }
 
 static const struct acpi_device_id cmpc_accel_device_ids[] = {
@@ -711,14 +715,13 @@ static const struct acpi_device_id cmpc_accel_device_ids[] = {
        {"", 0}
 };
 
-static struct acpi_driver cmpc_accel_acpi_driver = {
-       .name = "cmpc_accel",
-       .class = "cmpc_accel",
-       .ids = cmpc_accel_device_ids,
-       .ops = {
-               .add = cmpc_accel_add,
-               .remove = cmpc_accel_remove,
-       }
+static struct platform_driver cmpc_accel_acpi_driver = {
+       .probe = cmpc_accel_probe,
+       .remove = cmpc_accel_remove,
+       .driver = {
+               .name = "cmpc_accel",
+               .acpi_match_table = cmpc_accel_device_ids,
+       },
 };
 
 
@@ -1167,7 +1170,7 @@ static int cmpc_init(void)
        if (r)
                goto failed_tablet;
 
-       r = acpi_bus_register_driver(&cmpc_accel_acpi_driver);
+       r = platform_driver_register(&cmpc_accel_acpi_driver);
        if (r)
                goto failed_accel;
 
@@ -1178,7 +1181,7 @@ static int cmpc_init(void)
        return r;
 
 failed_accel_v4:
-       acpi_bus_unregister_driver(&cmpc_accel_acpi_driver);
+       platform_driver_unregister(&cmpc_accel_acpi_driver);
 
 failed_accel:
        acpi_bus_unregister_driver(&cmpc_tablet_acpi_driver);
@@ -1196,7 +1199,7 @@ failed_keys:
 static void cmpc_exit(void)
 {
        platform_driver_unregister(&cmpc_accel_acpi_driver_v4);
-       acpi_bus_unregister_driver(&cmpc_accel_acpi_driver);
+       platform_driver_unregister(&cmpc_accel_acpi_driver);
        acpi_bus_unregister_driver(&cmpc_tablet_acpi_driver);
        acpi_bus_unregister_driver(&cmpc_ipml_acpi_driver);
        acpi_bus_unregister_driver(&cmpc_keys_acpi_driver);