diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:12:43 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:12:43 +0200 |
| commit | e81a0e771c10de86fdb52c6baf534ff5fdeec72c (patch) | |
| tree | ffe50b402c51ea4f50f79954eb4a28deccca8bf1 /drivers/acpi | |
| parent | d9bd44933cb21faf2cfe09798c1a2c95563a0bcb (diff) | |
| parent | f70977fbd6359efb17bb93adac37b9f226d910a7 (diff) | |
| download | linux-e81a0e771c10de86fdb52c6baf534ff5fdeec72c.tar.gz linux-e81a0e771c10de86fdb52c6baf534ff5fdeec72c.tar.bz2 linux-e81a0e771c10de86fdb52c6baf534ff5fdeec72c.zip | |
Merge branch 'acpi-thermal'
* acpi-thermal:
ACPI / thermal: Use acpi_bus_attach_private_data() to attach private data
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/thermal.c | 11 |
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); } |