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@xxxxxxxxx>
---
drivers/platform/x86/dell/dell-rbtn.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/dell/dell-rbtn.c b/drivers/platform/x86/dell/dell-rbtn.c
index aa0e6c907494..679ff2d6adbf 100644
--- a/drivers/platform/x86/dell/dell-rbtn.c
+++ b/drivers/platform/x86/dell/dell-rbtn.c
@@ -293,7 +293,6 @@ static struct acpi_driver rbtn_driver = {
.ops = {
.add = rbtn_add,
.remove = rbtn_remove,
- .notify = rbtn_notify,
},
.owner = THIS_MODULE,
};
@@ -422,7 +421,10 @@ static int rbtn_add(struct acpi_device *device)
ret = -EINVAL;
}
- return ret;
+ if (ret)
+ return ret;
+
+ return acpi_device_install_event_handler(device, ACPI_DEVICE_NOTIFY, rbtn_notify);
}
@@ -430,6 +432,8 @@ static void rbtn_remove(struct acpi_device *device)
{
struct rbtn_data *rbtn_data = device->driver_data;
+ acpi_device_remove_event_handler(device, ACPI_DEVICE_NOTIFY, rbtn_notify);
+
switch (rbtn_data->type) {
case RBTN_TOGGLE:
rbtn_input_exit(rbtn_data);
@@ -445,9 +449,12 @@ static void rbtn_remove(struct acpi_device *device)
device->driver_data = NULL;
}
-static void rbtn_notify(struct acpi_device *device, u32 event)
+static void rbtn_notify(acpi_handle handle, u32 event, void *data)
{
- struct rbtn_data *rbtn_data = device->driver_data;
+ struct acpi_device *device = data;
+ struct rbtn_data *rbtn_data;
+
+ rbtn_data = device->driver_data;
/*
* Some BIOSes send a notification at resume.
--
2.38.1
