iio: light: acpi-als: 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>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/light/acpi-als.c b/drivers/iio/light/acpi-als.c
index d5d1a8b9c0354a24613b98169aa185690316a9ec..2fe6b493c012446471a0e027035fe590c395412e 100644 (file)
--- a/drivers/iio/light/acpi-als.c
+++ b/drivers/iio/light/acpi-als.c
@@ -90,9 +90,9 @@ static int acpi_als_read_value(struct acpi_als *als, char *prop, s32 *val)
        return 0;
 }
 
-static void acpi_als_notify(struct acpi_device *device, u32 event)
+static void acpi_als_notify(acpi_handle handle, u32 event, void *data)
 {
-       struct iio_dev *indio_dev = acpi_driver_data(device);
+       struct iio_dev *indio_dev = data;
        struct acpi_als *als = iio_priv(indio_dev);
 
        if (iio_buffer_enabled(indio_dev) && iio_trigger_using_own(indio_dev)) {
@@ -102,7 +102,7 @@ static void acpi_als_notify(struct acpi_device *device, u32 event)
                        break;
                default:
                        /* Unhandled event */
-                       dev_dbg(&device->dev,
+                       dev_dbg(&als->device->dev,
                                "Unhandled ACPI ALS event (%08x)!\n",
                                event);
                }
@@ -218,7 +218,17 @@ static int acpi_als_add(struct acpi_device *device)
        if (ret)
                return ret;
 
-       return devm_iio_device_register(dev, indio_dev);
+       ret = devm_iio_device_register(dev, indio_dev);
+       if (ret)
+               return ret;
+
+       return acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
+                                              acpi_als_notify, indio_dev);
+}
+
+static void acpi_als_remove(struct acpi_device *device)
+{
+       acpi_dev_remove_notify_handler(device, ACPI_DEVICE_NOTIFY, acpi_als_notify);
 }
 
 static const struct acpi_device_id acpi_als_device_ids[] = {
@@ -234,7 +244,7 @@ static struct acpi_driver acpi_als_driver = {
        .ids    = acpi_als_device_ids,
        .ops = {
                .add    = acpi_als_add,
-               .notify = acpi_als_notify,
+               .remove = acpi_als_remove,
        },
 };