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/sony-laptop.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 9569f11dec8c..93e630d937a8 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1178,7 +1178,7 @@ enum event_types {
KILLSWITCH,
GFX_SWITCH
};
-static void sony_nc_notify(struct acpi_device *device, u32 event)
+static void sony_nc_notify(acpi_handle handle, u32 event, void *data)
{
u32 real_ev = event;
u8 ev_type = 0;
@@ -3246,6 +3246,11 @@ static int sony_nc_add(struct acpi_device *device)
}
}
+ result = acpi_device_install_event_handler(device, ACPI_DEVICE_NOTIFY,
+ sony_nc_notify);
+ if (result)
+ goto out_sysfs;
+
pr_info("SNC setup done.\n");
return 0;
@@ -3272,6 +3277,7 @@ static void sony_nc_remove(struct acpi_device *device)
{
struct sony_nc_value *item;
+ acpi_device_remove_event_handler(device, ACPI_DEVICE_NOTIFY, sony_nc_notify);
sony_nc_backlight_cleanup();
sony_nc_acpi_device = NULL;
@@ -3307,7 +3313,6 @@ static struct acpi_driver sony_nc_driver = {
.ops = {
.add = sony_nc_add,
.remove = sony_nc_remove,
- .notify = sony_nc_notify,
},
.drv.pm = &sony_nc_pm,
};
--
2.40.1
