@@ -136,6 +136,8 @@ struct fujitsu_laptop {
static struct acpi_device *fext;
+static void acpi_fujitsu_laptop_notify(acpi_handle handle, u32 event, void *data);
+
/* Fujitsu ACPI interface function */
static int call_fext_func(struct acpi_device *device,
@@ -839,7 +841,12 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
if (ret)
goto err_free_fifo;
- return 0;
+ ret = acpi_device_install_event_handler(device, ACPI_DEVICE_NOTIFY,
+ acpi_fujitsu_laptop_notify);
+ if (ret)
+ goto err_free_fifo;
+
+ return ret;
err_free_fifo:
kfifo_free(&priv->fifo);
@@ -851,6 +858,8 @@ static void acpi_fujitsu_laptop_remove(struct acpi_device *device)
{
struct fujitsu_laptop *priv = acpi_driver_data(device);
+ acpi_device_remove_event_handler(device, ACPI_DEVICE_NOTIFY, acpi_fujitsu_laptop_notify);
+
fujitsu_laptop_platform_remove(device);
kfifo_free(&priv->fifo);
@@ -889,13 +898,16 @@ static void acpi_fujitsu_laptop_release(struct acpi_device *device)
}
}
-static void acpi_fujitsu_laptop_notify(struct acpi_device *device, u32 event)
+static void acpi_fujitsu_laptop_notify(acpi_handle handle, u32 event, void *data)
{
- struct fujitsu_laptop *priv = acpi_driver_data(device);
+ struct acpi_device *device = data;
+ struct fujitsu_laptop *priv;
unsigned long flags;
int scancode, i = 0;
unsigned int irb;
+ priv = acpi_driver_data(device);
+
if (event != ACPI_FUJITSU_NOTIFY_CODE) {
acpi_handle_info(device->handle, "Unsupported event [0x%x]\n",
event);
@@ -963,7 +975,6 @@ static struct acpi_driver acpi_fujitsu_laptop_driver = {
.ops = {
.add = acpi_fujitsu_laptop_add,
.remove = acpi_fujitsu_laptop_remove,
- .notify = acpi_fujitsu_laptop_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/fujitsu-laptop.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)