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/toshiba_acpi.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index b34984bbee33..29980c84d189 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -3190,6 +3190,8 @@ static void toshiba_acpi_remove(struct acpi_device *acpi_dev)
{
struct toshiba_acpi_dev *dev = acpi_driver_data(acpi_dev);
+ acpi_device_remove_event_handler(acpi_dev, ACPI_ALL_NOTIFY, toshiba_acpi_notify);
+
misc_deregister(&dev->miscdev);
remove_toshiba_proc_entries(dev);
@@ -3473,16 +3475,23 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
if (dev->battery_charge_mode_supported)
battery_hook_register(&battery_hook);
- return 0;
+ ret = acpi_device_install_event_handler(acpi_dev, ACPI_ALL_NOTIFY, toshiba_acpi_notify);
+ if (ret)
+ goto error;
+
+ return ret;
error:
toshiba_acpi_remove(acpi_dev);
return ret;
}
-static void toshiba_acpi_notify(struct acpi_device *acpi_dev, u32 event)
+static void toshiba_acpi_notify(acpi_handle handle, u32 event, void *data)
{
- struct toshiba_acpi_dev *dev = acpi_driver_data(acpi_dev);
+ struct acpi_device *acpi_dev = data;
+ struct toshiba_acpi_dev *dev;
+
+ dev = acpi_driver_data(acpi_dev);
switch (event) {
case 0x80: /* Hotkeys and some system events */
@@ -3583,11 +3592,9 @@ static struct acpi_driver toshiba_acpi_driver = {
.name = "Toshiba ACPI driver",
.owner = THIS_MODULE,
.ids = toshiba_device_ids,
- .flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS,
.ops = {
.add = toshiba_acpi_add,
.remove = toshiba_acpi_remove,
- .notify = toshiba_acpi_notify,
},
.drv.pm = &toshiba_acpi_pm,
};
--
2.38.1
