@@ -270,8 +270,9 @@ static void wmi_input_setup(void)
}
}
-static void acpi_notify(struct acpi_device *device, u32 event)
+static void acpi_notify(acpi_handle handle, u32 event, void *data)
{
+ struct acpi_device *device = data;
struct key_entry *key;
acpi_handle_debug(device->handle, "notify: %d\n", event);
@@ -752,7 +753,11 @@ static int acpi_add(struct acpi_device *device)
wmi_input_setup();
battery_hook_register(&battery_hook);
- return 0;
+ ret = acpi_device_install_event_handler(device, ACPI_DEVICE_NOTIFY, acpi_notify);
+ if (ret)
+ goto out_platform_device;
+
+ return ret;
out_platform_device:
platform_device_unregister(pf_device);
@@ -763,6 +768,8 @@ static int acpi_add(struct acpi_device *device)
static void acpi_remove(struct acpi_device *device)
{
+ acpi_device_remove_event_handler(device, ACPI_DEVICE_NOTIFY, acpi_notify);
+
sysfs_remove_group(&pf_device->dev.kobj, &dev_attribute_group);
led_classdev_unregister(&tpad_led);
@@ -788,7 +795,6 @@ static struct acpi_driver acpi_driver = {
.ops = {
.add = acpi_add,
.remove = acpi_remove,
- .notify = acpi_notify,
},
.owner = THIS_MODULE,
};
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/lg-laptop.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)