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

platform/x86: wireless-hotkey: 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 airplane mode button for AMD, HP and
Xiaomi laptops 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/9607409.CDJkKcVGEf@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:
Rafael J. Wysocki 2026-03-12 15:40:36 +01:00 committed by Ilpo Järvinen
parent cfc897f6d3
commit 8507277ef1
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/platform/x86/wireless-hotkey.c
View File

@ -35,16 +35,17 @@ static const struct acpi_device_id wl_ids[] = {
{"", 0}, {"", 0},
}; };
static int wireless_input_setup(struct acpi_device *device) static int wireless_input_setup(struct device *dev)
{ {
struct wl_button *button = acpi_driver_data(device); struct wl_button *button = dev_get_drvdata(dev);
int err; int err;
button->input_dev = input_allocate_device(); button->input_dev = input_allocate_device();
if (!button->input_dev) if (!button->input_dev)
return -ENOMEM; return -ENOMEM;
snprintf(button->phys, sizeof(button->phys), "%s/input0", acpi_device_hid(device)); snprintf(button->phys, sizeof(button->phys), "%s/input0",
acpi_device_hid(ACPI_COMPANION(dev)));
button->input_dev->name = "Wireless hotkeys"; button->input_dev->name = "Wireless hotkeys";
button->input_dev->phys = button->phys; button->input_dev->phys = button->phys;
@ -63,9 +64,9 @@ static int wireless_input_setup(struct acpi_device *device)
return err; return err;
} }
static void wireless_input_destroy(struct acpi_device *device) static void wireless_input_destroy(struct device *dev)
{ {
struct wl_button *button = acpi_driver_data(device); struct wl_button *button = dev_get_drvdata(dev);
input_unregister_device(button->input_dev); input_unregister_device(button->input_dev);
kfree(button); kfree(button);
@ -86,7 +87,7 @@ static void wl_notify(acpi_handle handle, u32 event, void *data)
input_sync(button->input_dev); input_sync(button->input_dev);
} }
static int wl_add(struct acpi_device *device) static int wl_probe(struct platform_device *pdev)
{ {
struct wl_button *button; struct wl_button *button;
int err; int err;
@ -95,37 +96,38 @@ static int wl_add(struct acpi_device *device)
if (!button) if (!button)
return -ENOMEM; return -ENOMEM;
device->driver_data = button; platform_set_drvdata(pdev, button);
err = wireless_input_setup(device); err = wireless_input_setup(&pdev->dev);
if (err) { if (err) {
pr_err("Failed to setup wireless hotkeys\n"); pr_err("Failed to setup wireless hotkeys\n");
kfree(button); kfree(button);
return err; return err;
} }
err = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY, err = acpi_dev_install_notify_handler(ACPI_COMPANION(&pdev->dev),
wl_notify, button); ACPI_DEVICE_NOTIFY, wl_notify, button);
if (err) { if (err) {
pr_err("Failed to install ACPI notify handler\n"); pr_err("Failed to install ACPI notify handler\n");
wireless_input_destroy(device); wireless_input_destroy(&pdev->dev);
} }
return err; return err;
} }
static void wl_remove(struct acpi_device *device) static void wl_remove(struct platform_device *pdev)
{ {
acpi_dev_remove_notify_handler(device, ACPI_DEVICE_NOTIFY, wl_notify); acpi_dev_remove_notify_handler(ACPI_COMPANION(&pdev->dev),
wireless_input_destroy(device); ACPI_DEVICE_NOTIFY, wl_notify);
wireless_input_destroy(&pdev->dev);
} }
static struct acpi_driver wl_driver = { static struct platform_driver wl_driver = {
.name = "wireless-hotkey", .probe = wl_probe,
.ids = wl_ids, .remove = wl_remove,
.ops = { .driver = {
.add = wl_add, .name = "wireless-hotkey",
.remove = wl_remove, .acpi_match_table = wl_ids,
}, },
}; };
module_acpi_driver(wl_driver); module_platform_driver(wl_driver);