[PATCH v5 10/10] acpi/thermal: Move handler installing logic to driver

[Michal Wilczynski]

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_dev_install_notify_handler() at the end of .add() callback.
Call acpi_dev_remove_notify_handler() at the beginning of .remove()
callback. Change arguments passed to the notify function to match with
what's required by acpi_install_notify_handler(). Remove .notify
callback initialization in acpi_driver.

While at it, fix whitespaces in .remove() callback and move tz
assignment upwards.

Suggested-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
Signed-off-by: Michal Wilczynski <michal.wilczyn...@intel.com>
---
 drivers/acpi/thermal.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index f9f6ebb08fdb..84716e4b967c 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -825,9 +825,12 @@ static void acpi_queue_thermal_check(struct acpi_thermal 
*tz)
                queue_work(acpi_thermal_pm_queue, &tz->thermal_check_work);
 }
 
-static void acpi_thermal_notify(struct acpi_device *device, u32 event)
+static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
 {
-       struct acpi_thermal *tz = acpi_driver_data(device);
+       struct acpi_device *device = data;
+       struct acpi_thermal *tz;
+
+       tz = acpi_driver_data(device);
 
        if (!tz)
                return;
@@ -997,11 +1000,20 @@ static int acpi_thermal_add(struct acpi_device *device)
 
        pr_info("%s [%s] (%ld C)\n", acpi_device_name(device),
                acpi_device_bid(device), 
deci_kelvin_to_celsius(tz->temperature));
-       goto end;
 
+       result = acpi_dev_install_notify_handler(device,
+                                                ACPI_DEVICE_NOTIFY,
+                                                acpi_thermal_notify);
+       if (result)
+               goto flush_wq_and_unregister;
+
+       return 0;
+
+flush_wq_and_unregister:
+       flush_workqueue(acpi_thermal_pm_queue);
+       acpi_thermal_unregister_thermal_zone(tz);
 free_memory:
        kfree(tz);
-end:
        return result;
 }
 
@@ -1012,10 +1024,15 @@ static void acpi_thermal_remove(struct acpi_device 
*device)
        if (!device || !acpi_driver_data(device))
                return;
 
-       flush_workqueue(acpi_thermal_pm_queue);
        tz = acpi_driver_data(device);
 
+       acpi_dev_remove_notify_handler(device,
+                                      ACPI_DEVICE_NOTIFY,
+                                      acpi_thermal_notify);
+
+       flush_workqueue(acpi_thermal_pm_queue);
        acpi_thermal_unregister_thermal_zone(tz);
+
        kfree(tz);
 }
 
@@ -1078,7 +1095,6 @@ static struct acpi_driver acpi_thermal_driver = {
        .ops = {
                .add = acpi_thermal_add,
                .remove = acpi_thermal_remove,
-               .notify = acpi_thermal_notify,
                },
        .drv.pm = &acpi_thermal_pm,
 };
-- 
2.41.0