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/surface/surfacepro3_button.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c
index 2755601f979c..fa5f1e4c4abc 100644
--- a/drivers/platform/surface/surfacepro3_button.c
+++ b/drivers/platform/surface/surfacepro3_button.c
@@ -71,13 +71,16 @@ struct surface_button {
bool suspended;
};
-static void surface_button_notify(struct acpi_device *device, u32 event)
+static void surface_button_notify(acpi_handle handle, u32 event, void *data)
{
- struct surface_button *button = acpi_driver_data(device);
- struct input_dev *input;
+ struct acpi_device *device = data;
+ struct surface_button *button;
int key_code = KEY_RESERVED;
+ struct input_dev *input;
bool pressed = false;
+ button = acpi_driver_data(device);
+
switch (event) {
/* Power button press,release handle */
case SURFACE_BUTTON_NOTIFY_PRESS_POWER:
@@ -230,6 +233,12 @@ static int surface_button_add(struct acpi_device *device)
device_init_wakeup(&device->dev, true);
dev_info(&device->dev,
"%s [%s]\n", name, acpi_device_bid(device));
+
+ error = acpi_device_install_event_handler(device, ACPI_DEVICE_NOTIFY,
+ surface_button_notify);
+ if (error)
+ goto err_free_input;
+
return 0;
err_free_input:
@@ -243,6 +252,7 @@ static void surface_button_remove(struct acpi_device *device)
{
struct surface_button *button = acpi_driver_data(device);
+ acpi_device_remove_event_handler(device, ACPI_DEVICE_NOTIFY, surface_button_notify);
input_unregister_device(button->input);
kfree(button);
}
@@ -257,7 +267,6 @@ static struct acpi_driver surface_button_driver = {
.ops = {
.add = surface_button_add,
.remove = surface_button_remove,
- .notify = surface_button_notify,
},
.drv.pm = &surface_button_pm,
};
--
2.40.1
