ACPI: thermal: Install Notify() handler directly

Modify the ACPI thermal driver to install its own Notify() handler
directly instead of providing an ACPI driver .notify() callback.

This will allow the ACPI driver .notify() callback to be eliminated and
it will allow the thermal driver to be switched over to a platform one
in the future.

While at it, fix up whitespaces in acpi_thermal_remove().

Suggested-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com>
[ rjw: Subject and changelog edits, whitespace adjustments ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index f9f6ebb08fdb76f58cf1f663d04e2d00b4e8a8ee..7d543ede775e5005fc5bdbfc3f8f7811f4c3ad3c 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -825,8 +825,9 @@ 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_device *device = data;
        struct acpi_thermal *tz = acpi_driver_data(device);
 
        if (!tz)
@@ -997,11 +998,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;
+
+       return 0;
+
+flush_wq:
+       flush_workqueue(acpi_thermal_pm_queue);
+       acpi_thermal_unregister_thermal_zone(tz);
 free_memory:
        kfree(tz);
-end:
+
        return result;
 }
 
@@ -1012,10 +1022,14 @@ 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 +1092,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,
 };