hpet: Convert ACPI driver to a platform one
Rafael J. Wysocki
maintainerPATCH 1/1 hpet: Convert ACPI driver to a platform one
From: "Rafael J. Wysocki" <[email protected]>
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 HPET 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.
--- drivers/char/hpet.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/char/hpet.c +10 -8
@@ -34,6 +34,7 @@#include <linux/io.h> #include <linux/acpi.h> #include <linux/hpet.h> +#include <linux/platform_device.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h>
@@ -971,8 +972,9 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)return AE_OK ; } -static int hpet_acpi_add (struct acpi_device *device) +static int hpet_acpi_probe (struct platform_device *pdev) { +struct acpi_device *device =ACPI_COMPANION (&pdev->dev);acpi_status result;struct hpet_data data;
@@ -1000,12 +1002,12 @@ static const struct acpi_device_id hpet_device_ids[] = { {"", 0}, }; -static struct acpi_driver hpet_acpi_driver = { - .name ="hpet" , - .ids = hpet_device_ids, - .ops = { - .add = hpet_acpi_add, - }, +static struct platform_driver hpet_acpi_driver = { + .probe = hpet_acpi_probe, + .driver = { + .name ="hpet_acpi" , + .acpi_match_table = hpet_device_ids, + }, };static struct miscdevice hpet_misc = {HPET_MINOR ,"hpet" , &hpet_fops };
@@ -1020,7 +1022,7 @@ static int __init hpet_init(void) sysctl_header =register_sysctl ("dev/hpet" , hpet_table); - result =acpi_bus_register_driver (&hpet_acpi_driver); + result =platform_driver_register (&hpet_acpi_driver);if (result <0 ) {unregister_sysctl_table (sysctl_header);misc_deregister (&hpet_misc);
Signature · 1 line
2.51.0
Rafael J. Wysocki
maintainerQuoted 65 lines · Rafael J. Wysocki
From: "Rafael J. Wysocki" <[email protected]>
In all cases in which a struct
acpi_driveris 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 structplatform_drivershould 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 HPET 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.
Signed-off-by Rafael J. Wysocki <[email protected]>--- drivers/char/hpet.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)drivers/char/hpet.c +9
-7@@ -34,6 +34,7 @@#include <linux/io.h> #include <linux/acpi.h> #include <linux/hpet.h> +#include <linux/platform_device.h> #include <asm/current.h> #include <asm/irq.h> #include <asm/div64.h> @@ -971,8 +972,9 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)return AE_OK ; } -static int hpet_acpi_add (struct acpi_device *device) +static int hpet_acpi_probe (struct platform_device *pdev) { +struct acpi_device *device =ACPI_COMPANION (&pdev->dev);acpi_status result;struct hpet_data data;@@ -1000,12 +1002,12 @@ static const struct acpi_device_id hpet_device_ids[] = { {"", 0}, }; -static struct acpi_driver hpet_acpi_driver = { - .name ="hpet" , - .ids = hpet_device_ids, - .ops = { - .add = hpet_acpi_add, - }, +static struct platform_driver hpet_acpi_driver = { + .probe = hpet_acpi_probe, + .driver = { + .name ="hpet_acpi" , + .acpi_match_table = hpet_device_ids, + }, };static struct miscdevice hpet_misc = {HPET_MINOR ,"hpet" , &hpet_fops };
drivers/char/hpet.c static int __init hpet_init(void)
Quoted 9 lines
drivers/char/hpet.c +1
-2@@ -1020,7 +1022,7 @@ static int __init hpet_init(void) sysctl_header =register_sysctl ("dev/hpet" , hpet_table); - result =acpi_bus_register_driver (&hpet_acpi_driver); + result =platform_driver_register (&hpet_acpi_driver);if (result <0 ) {unregister_sysctl_table (sysctl_header);misc_deregister (&hpet_misc); --
If anyone has any objections or concerns regarding this change, please let me know.
In the absence of any, I'll queue it up for 7.1.
Thanks!