Merge back earlier ACPI thermal material.

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 25bbc55dca89..112817e963e0 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -925,13 +925,10 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
         if (result)
                 return result;
 
-        status = acpi_attach_data(tz->device->handle,
-                                  acpi_bus_private_data_handler,
-                                  tz->thermal_zone);
-        if (ACPI_FAILURE(status)) {
-                pr_err(PREFIX "Error attaching device data\n");
+        status =  acpi_bus_attach_private_data(tz->device->handle,
+                                               tz->thermal_zone);
+        if (ACPI_FAILURE(status))
                 return -ENODEV;
-        }
 
         tz->tz_enabled = 1;
 
@@ -946,7 +943,7 @@ static void acpi_thermal_unregister_thermal_zone(struct acpi_thermal *tz)
         sysfs_remove_link(&tz->thermal_zone->device.kobj, "device");
         thermal_zone_device_unregister(tz->thermal_zone);
         tz->thermal_zone = NULL;
-        acpi_detach_data(tz->device->handle, acpi_bus_private_data_handler);
+        acpi_bus_detach_private_data(tz->device->handle);
 }