platform/x86: dell/dell-rbtn: Register ACPI notify handler directly

To facilitate subsequent conversion of the driver to a platform one,
make it install an ACPI notify handler directly instead of using
a .notify() callback in struct acpi_driver.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/9591832.CDJkKcVGEf@rafael.j.wysocki
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/dell/dell-rbtn.c b/drivers/platform/x86/dell/dell-rbtn.c
index a415c432d4c38f3ddb6504fe527319927a01ac1e..b9038d9ddcad89fad6133228a2e815a3cb2b45ac 100644 (file)
--- a/drivers/platform/x86/dell/dell-rbtn.c
+++ b/drivers/platform/x86/dell/dell-rbtn.c
@@ -207,7 +207,7 @@ static void rbtn_input_event(struct rbtn_data *rbtn_data)
 
 static int rbtn_add(struct acpi_device *device);
 static void rbtn_remove(struct acpi_device *device);
-static void rbtn_notify(struct acpi_device *device, u32 event);
+static void rbtn_notify(acpi_handle handle, u32 event, void *data);
 
 static const struct acpi_device_id rbtn_ids[] = {
        { "DELRBTN", 0 },
@@ -293,7 +293,6 @@ static struct acpi_driver rbtn_driver = {
        .ops = {
                .add = rbtn_add,
                .remove = rbtn_remove,
-               .notify = rbtn_notify,
        },
 };
 
@@ -382,6 +381,22 @@ EXPORT_SYMBOL_GPL(dell_rbtn_notifier_unregister);
  * acpi driver functions
  */
 
+static void rbtn_cleanup(struct acpi_device *device)
+{
+       struct rbtn_data *rbtn_data = device->driver_data;
+
+       switch (rbtn_data->type) {
+       case RBTN_TOGGLE:
+               rbtn_input_exit(rbtn_data);
+               break;
+       case RBTN_SLIDER:
+               rbtn_rfkill_exit(device);
+               break;
+       default:
+               break;
+       }
+}
+
 static int rbtn_add(struct acpi_device *device)
 {
        struct rbtn_data *rbtn_data;
@@ -422,31 +437,32 @@ static int rbtn_add(struct acpi_device *device)
                break;
        }
        if (ret)
-               rbtn_acquire(device, false);
+               goto err;
+
+       ret = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
+                                             rbtn_notify, device);
+       if (ret)
+               goto err_cleanup;
 
+       return 0;
+
+err_cleanup:
+       rbtn_cleanup(device);
+err:
+       rbtn_acquire(device, false);
        return ret;
 }
 
 static void rbtn_remove(struct acpi_device *device)
 {
-       struct rbtn_data *rbtn_data = device->driver_data;
-
-       switch (rbtn_data->type) {
-       case RBTN_TOGGLE:
-               rbtn_input_exit(rbtn_data);
-               break;
-       case RBTN_SLIDER:
-               rbtn_rfkill_exit(device);
-               break;
-       default:
-               break;
-       }
-
+       acpi_dev_remove_notify_handler(device, ACPI_DEVICE_NOTIFY, rbtn_notify);
+       rbtn_cleanup(device);
        rbtn_acquire(device, false);
 }
 
-static void rbtn_notify(struct acpi_device *device, u32 event)
+static void rbtn_notify(acpi_handle handle, u32 event, void *data)
 {
+       struct acpi_device *device = data;
        struct rbtn_data *rbtn_data = device->driver_data;
 
        /*