leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'acpi-thermal'

Browse Source 
* acpi-thermal:
  ACPI / thermal: Use acpi_bus_attach_private_data() to attach private data
This commit is contained in:
Rafael J. Wysocki 2014-06-03 23:12:43 +02:00
commit e81a0e771c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/acpi/thermal.c
View File

@ -925,13 +925,10 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
if (result) if (result)
return result; return result;
status = acpi_attach_data(tz->device->handle, status = acpi_bus_attach_private_data(tz->device->handle,
acpi_bus_private_data_handler, tz->thermal_zone);
tz->thermal_zone); if (ACPI_FAILURE(status))
if (ACPI_FAILURE(status)) {
pr_err(PREFIX "Error attaching device data\n");
return -ENODEV; return -ENODEV;
}
tz->tz_enabled = 1; 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"); sysfs_remove_link(&tz->thermal_zone->device.kobj, "device");
thermal_zone_device_unregister(tz->thermal_zone); thermal_zone_device_unregister(tz->thermal_zone);
tz->thermal_zone = NULL; tz->thermal_zone = NULL;
acpi_detach_data(tz->device->handle, acpi_bus_private_data_handler); acpi_bus_detach_private_data(tz->device->handle);
} }