github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 18:21:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

sonypi: Convert ACPI driver to a platform one

Browse Source 
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 sonypi 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/ [1]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://patch.msgid.link/2277493.Mh6RI2rZIc@rafael.j.wysocki
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rafael J. Wysocki 2026-02-23 16:59:14 +01:00 committed by Greg Kroah-Hartman
parent 2d7ce8eb59
commit 7e488b0af0
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/char/sonypi.c
View File

@ -1115,15 +1115,17 @@ static int sonypi_disable(void)
} }
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static int sonypi_acpi_add(struct acpi_device *device) static int sonypi_acpi_probe(struct platform_device *pdev)
{ {
struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
sonypi_acpi_device = device; sonypi_acpi_device = device;
strcpy(acpi_device_name(device), "Sony laptop hotkeys"); strcpy(acpi_device_name(device), "Sony laptop hotkeys");
strcpy(acpi_device_class(device), "sony/hotkey"); strcpy(acpi_device_class(device), "sony/hotkey");
return 0; return 0;
} }
static void sonypi_acpi_remove(struct acpi_device *device) static void sonypi_acpi_remove(struct platform_device *pdev)
{ {
sonypi_acpi_device = NULL; sonypi_acpi_device = NULL;
} }
@ -1133,13 +1135,12 @@ static const struct acpi_device_id sonypi_device_ids[] = {
{"", 0}, {"", 0},
}; };
static struct acpi_driver sonypi_acpi_driver = { static struct platform_driver sonypi_acpi_driver = {
.name = "sonypi", .probe = sonypi_acpi_probe,
.class = "hkey", .remove = sonypi_acpi_remove,
.ids = sonypi_device_ids, .driver = {
.ops = { .name = "sonypi_acpi",
.add = sonypi_acpi_add, .acpi_match_table = sonypi_device_ids,
.remove = sonypi_acpi_remove,
}, },
}; };
#endif #endif
@ -1518,8 +1519,8 @@ static int __init sonypi_init(void)
goto err_free_device; goto err_free_device;
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
if (acpi_bus_register_driver(&sonypi_acpi_driver) >= 0) error = platform_driver_register(&sonypi_acpi_driver);
acpi_driver_registered = 1; acpi_driver_registered = !error;
#endif #endif
return 0; return 0;
@ -1535,7 +1536,7 @@ static void __exit sonypi_exit(void)
{ {
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
if (acpi_driver_registered) if (acpi_driver_registered)
acpi_bus_unregister_driver(&sonypi_acpi_driver); platform_driver_unregister(&sonypi_acpi_driver);
#endif #endif
platform_device_unregister(sonypi_platform_device); platform_device_unregister(sonypi_platform_device);
platform_driver_unregister(&sonypi_driver); platform_driver_unregister(&sonypi_driver);