platform/x86: sony-laptop: 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/2559802.jE0xQCEvom@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/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index d3e7a52c22a7613227e023021e1b2da8967dadd4..6f417b5cdfe27c1184db1500cfa3f98d4b954b32 100644 (file)
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1176,7 +1176,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 ah, u32 event, void *data)
 {
        u32 real_ev = event;
        u8 ev_type = 0;
@@ -3244,6 +3244,11 @@ static int sony_nc_add(struct acpi_device *device)
                }
        }
 
+       result = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
+                                                sony_nc_notify, NULL);
+       if (result)
+               goto out_sysfs;
+
        pr_info("SNC setup done.\n");
        return 0;
 
@@ -3270,6 +3275,8 @@ static void sony_nc_remove(struct acpi_device *device)
 {
        struct sony_nc_value *item;
 
+       acpi_dev_remove_notify_handler(device, ACPI_DEVICE_NOTIFY, sony_nc_notify);
+
        sony_nc_backlight_cleanup();
 
        sony_nc_acpi_device = NULL;
@@ -3304,7 +3311,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,
 };