mirror of
https://github.com/torvalds/linux.git
synced 2026-05-31 02:24:24 +02:00
platform/x86: wireless-hotkey: Register ACPI notify handler directly
To facilitate subsequent conversion of the driver to a platform one, make it install an ACPI notify handler directly instead of using a .notify() callback in struct acpi_driver. No intentional functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Link: https://patch.msgid.link/3953848.kQq0lBPeGt@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
3471415c81
commit
cfc897f6d3
|
|
@ -71,9 +71,9 @@ static void wireless_input_destroy(struct acpi_device *device)
|
|||
kfree(button);
|
||||
}
|
||||
|
||||
static void wl_notify(struct acpi_device *acpi_dev, u32 event)
|
||||
static void wl_notify(acpi_handle handle, u32 event, void *data)
|
||||
{
|
||||
struct wl_button *button = acpi_driver_data(acpi_dev);
|
||||
struct wl_button *button = data;
|
||||
|
||||
if (event != 0x80) {
|
||||
pr_info("Received unknown event (0x%x)\n", event);
|
||||
|
|
@ -101,6 +101,13 @@ static int wl_add(struct acpi_device *device)
|
|||
if (err) {
|
||||
pr_err("Failed to setup wireless hotkeys\n");
|
||||
kfree(button);
|
||||
return err;
|
||||
}
|
||||
err = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
|
||||
wl_notify, button);
|
||||
if (err) {
|
||||
pr_err("Failed to install ACPI notify handler\n");
|
||||
wireless_input_destroy(device);
|
||||
}
|
||||
|
||||
return err;
|
||||
|
|
@ -108,6 +115,7 @@ static int wl_add(struct acpi_device *device)
|
|||
|
||||
static void wl_remove(struct acpi_device *device)
|
||||
{
|
||||
acpi_dev_remove_notify_handler(device, ACPI_DEVICE_NOTIFY, wl_notify);
|
||||
wireless_input_destroy(device);
|
||||
}
|
||||
|
||||
|
|
@ -117,7 +125,6 @@ static struct acpi_driver wl_driver = {
|
|||
.ops = {
|
||||
.add = wl_add,
|
||||
.remove = wl_remove,
|
||||
.notify = wl_notify,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user