@@ -68,9 +68,12 @@ 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 acpi_device *acpi_dev = data;
+ struct wl_button *button;
+
+ button = acpi_driver_data(acpi_dev);
if (event != 0x80) {
pr_info("Received unknown event (0x%x)\n", event);
@@ -95,16 +98,24 @@ static int wl_add(struct acpi_device *device)
device->driver_data = button;
err = wireless_input_setup(device);
- if (err) {
- pr_err("Failed to setup wireless hotkeys\n");
- kfree(button);
- }
+ if (err)
+ goto fail;
+ err = acpi_device_install_event_handler(device, ACPI_DEVICE_NOTIFY, wl_notify);
+ if (err)
+ goto fail;
+
+ return 0;
+
+fail:
+ pr_err("Failed to setup wireless hotkeys\n");
+ kfree(button);
return err;
}
static void wl_remove(struct acpi_device *device)
{
+ acpi_device_remove_event_handler(device, ACPI_DEVICE_NOTIFY, wl_notify);
wireless_input_destroy(device);
}
@@ -115,7 +126,6 @@ static struct acpi_driver wl_driver = {
.ops = {
.add = wl_add,
.remove = wl_remove,
- .notify = wl_notify,
},
};
Currently logic for installing notifications from ACPI devices is implemented using notify callback in struct acpi_driver. Preparations are being made to replace acpi_driver with more generic struct platform_driver, which doesn't contain notify callback. Furthermore as of now handlers are being called indirectly through acpi_notify_device(), which decreases performance. Call acpi_device_install_event_handler() at the end of .add() callback. Call acpi_device_remove_event_handler() at the beginning of .remove() callback. Change arguments passed to the notify callback to match with what's required by acpi_device_install_event_handler(). Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com> --- drivers/platform/x86/wireless-hotkey.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)