mirror of
https://github.com/torvalds/linux.git
synced 2026-06-01 11:03:43 +02:00
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/ [1] 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>
This commit is contained in:
parent
c12fe0b2c1
commit
2d9cb20610
|
|
@ -759,8 +759,9 @@ static void lg_laptop_remove_address_space_handler(void *data)
|
||||||
&lg_laptop_address_space_handler);
|
&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 = {
|
struct platform_device_info pdev_info = {
|
||||||
.fwnode = acpi_fwnode_handle(device),
|
.fwnode = acpi_fwnode_handle(device),
|
||||||
.name = PLATFORM_NAME,
|
.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,
|
status = acpi_install_address_space_handler(device->handle, LG_ADDRESS_SPACE_ID,
|
||||||
&lg_laptop_address_space_handler,
|
&lg_laptop_address_space_handler,
|
||||||
NULL, &device->dev);
|
NULL, &pdev->dev);
|
||||||
if (ACPI_FAILURE(status))
|
if (ACPI_FAILURE(status))
|
||||||
return -ENODEV;
|
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);
|
device);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
@ -874,7 +875,7 @@ static int acpi_add(struct acpi_device *device)
|
||||||
return ret;
|
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);
|
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);
|
MODULE_DEVICE_TABLE(acpi, device_ids);
|
||||||
|
|
||||||
static struct acpi_driver acpi_driver = {
|
static struct platform_driver acpi_driver = {
|
||||||
.name = "LG Gram Laptop Support",
|
.probe = acpi_probe,
|
||||||
.class = "lg-laptop",
|
|
||||||
.ids = device_ids,
|
|
||||||
.ops = {
|
|
||||||
.add = acpi_add,
|
|
||||||
.remove = acpi_remove,
|
.remove = acpi_remove,
|
||||||
|
.driver = {
|
||||||
|
.name = "LG Gram Laptop Support",
|
||||||
|
.acpi_match_table = device_ids,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __init acpi_init(void)
|
module_platform_driver(acpi_driver);
|
||||||
{
|
|
||||||
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);
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user