@@ -56,8 +56,9 @@ static int ebook_send_state(struct acpi_device *device)
return 0;
}
-static void ebook_switch_notify(struct acpi_device *device, u32 event)
+static void ebook_switch_notify(acpi_handle handle, u32 event, void *data)
{
+ struct acpi_device *device = data;
switch (event) {
case ACPI_FIXED_HARDWARE_EVENT:
case XO15_EBOOK_NOTIFY_STATUS:
@@ -134,7 +135,11 @@ static int ebook_switch_add(struct acpi_device *device)
device_set_wakeup_enable(&device->dev, true);
}
- return 0;
+ error = acpi_device_install_event_handler(device, ACPI_DEVICE_NOTIFY, ebook_switch_notify);
+ if (error)
+ goto err_free_input;
+
+ return error;
err_free_input:
input_free_device(input);
@@ -147,6 +152,7 @@ static void ebook_switch_remove(struct acpi_device *device)
{
struct ebook_switch *button = acpi_driver_data(device);
+ acpi_device_remove_event_handler(device, ACPI_DEVICE_NOTIFY, ebook_switch_notify);
input_unregister_device(button->input);
kfree(button);
}
@@ -158,7 +164,6 @@ static struct acpi_driver xo15_ebook_driver = {
.ops = {
.add = ebook_switch_add,
.remove = ebook_switch_remove,
- .notify = ebook_switch_notify,
},
.drv.pm = &ebook_switch_pm,
};
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/xo15-ebook.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)