platform/x86: fujitsu-tablet: 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 fujitsu-tablet ACPI driver to a platform
one.

After this change, the subordinate input device will be registered under
the platform device used for driver binding instead of its ACPI companion.

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/
Acked-by: Jonathan Woithe <jwoithe@just42.net>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/2403432.ElGaqSPkdT@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/fujitsu-tablet.c b/drivers/platform/x86/fujitsu-tablet.c
index 17f08ce7552d77400be728b90abbf02a16a03b9c..8319df28e9b8a64d80333f558225b3bfe49771f3 100644 (file)
--- a/drivers/platform/x86/fujitsu-tablet.c
+++ b/drivers/platform/x86/fujitsu-tablet.c
@@ -18,6 +18,7 @@
 #include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/dmi.h>
+#include <linux/platform_device.h>
 
 #define MODULENAME "fujitsu-tablet"
 
@@ -442,14 +443,12 @@ static acpi_status fujitsu_walk_resources(struct acpi_resource *res, void *data)
        }
 }
 
-static int acpi_fujitsu_add(struct acpi_device *adev)
+static int acpi_fujitsu_probe(struct platform_device *pdev)
 {
+       struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
        acpi_status status;
        int error;
 
-       if (!adev)
-               return -EINVAL;
-
        status = acpi_walk_resources(adev->handle, METHOD_NAME__CRS,
                        fujitsu_walk_resources, NULL);
        if (ACPI_FAILURE(status) || !fujitsu.irq || !fujitsu.io_base)
@@ -461,7 +460,7 @@ static int acpi_fujitsu_add(struct acpi_device *adev)
        snprintf(fujitsu.phys, sizeof(fujitsu.phys),
                        "%s/input0", acpi_device_hid(adev));
 
-       error = input_fujitsu_setup(&adev->dev,
+       error = input_fujitsu_setup(&pdev->dev,
                acpi_device_name(adev), fujitsu.phys);
        if (error)
                return error;
@@ -484,7 +483,7 @@ static int acpi_fujitsu_add(struct acpi_device *adev)
        return 0;
 }
 
-static void acpi_fujitsu_remove(struct acpi_device *adev)
+static void acpi_fujitsu_remove(struct platform_device *pdev)
 {
        free_irq(fujitsu.irq, fujitsu_interrupt);
        release_region(fujitsu.io_base, fujitsu.io_length);
@@ -501,15 +500,14 @@ static int acpi_fujitsu_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(acpi_fujitsu_pm, NULL, acpi_fujitsu_resume);
 
-static struct acpi_driver acpi_fujitsu_driver = {
-       .name  = MODULENAME,
-       .class = "hotkey",
-       .ids   = fujitsu_ids,
-       .ops   = {
-               .add    = acpi_fujitsu_add,
-               .remove = acpi_fujitsu_remove,
+static struct platform_driver acpi_fujitsu_driver = {
+       .probe = acpi_fujitsu_probe,
+       .remove = acpi_fujitsu_remove,
+       .driver = {
+               .name = MODULENAME,
+               .acpi_match_table = fujitsu_ids,
+               .pm = &acpi_fujitsu_pm,
        },
-       .drv.pm = &acpi_fujitsu_pm,
 };
 
 static int __init fujitsu_module_init(void)
@@ -518,7 +516,7 @@ static int __init fujitsu_module_init(void)
 
        dmi_check_system(dmi_ids);
 
-       error = acpi_bus_register_driver(&acpi_fujitsu_driver);
+       error = platform_driver_register(&acpi_fujitsu_driver);
        if (error)
                return error;
 
@@ -527,7 +525,7 @@ static int __init fujitsu_module_init(void)
 
 static void __exit fujitsu_module_exit(void)
 {
-       acpi_bus_unregister_driver(&acpi_fujitsu_driver);
+       platform_driver_unregister(&acpi_fujitsu_driver);
 }
 
 module_init(fujitsu_module_init);