ACPI / thermal: Use acpi_bus_attach_private_data() to attach private data
authorLan Tianyu <tianyu.lan@intel.com>
Tue, 20 May 2014 12:59:22 +0000 (20:59 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 May 2014 23:21:44 +0000 (01:21 +0200)
Use acpi_bus_attach_private_data() to attach private data
instead of acpi_attach_data().

Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/thermal.c

index c1e31a41f94957d87ded390dfbfcc54333728e3c..ae195fde858d588308baa4691535c94814b7ea4a 100644 (file)
@@ -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);
 }