diff options
author | Lan Tianyu <tianyu.lan@intel.com> | 2013-08-14 09:00:37 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 17:23:57 -0400 |
commit | 8a6036b92620a4ea0a1285d5c134ac9610ff4b32 (patch) | |
tree | 8f5e85682caef062cfa228ee5b808587ba841d1c /drivers/acpi/thermal.c | |
parent | f3ce717e60572421f56d89c9a85ac42e634d16e7 (diff) |
ACPI / thermal: Remove the unused lock of struct acpi_thermal
The acpi_thermal->lock now just is initialized when a thermal zone
device is added and destroyed when the thermal zone is removed.
It is never used in any other places, so remove it.
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Acked-by: Durgadoss R <durgadoss.r@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/thermal.c')
-rw-r--r-- | drivers/acpi/thermal.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 547a906a7662..dc1ba6c9ef5d 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
@@ -190,7 +190,6 @@ struct acpi_thermal { | |||
190 | struct thermal_zone_device *thermal_zone; | 190 | struct thermal_zone_device *thermal_zone; |
191 | int tz_enabled; | 191 | int tz_enabled; |
192 | int kelvin_offset; | 192 | int kelvin_offset; |
193 | struct mutex lock; | ||
194 | }; | 193 | }; |
195 | 194 | ||
196 | /* -------------------------------------------------------------------------- | 195 | /* -------------------------------------------------------------------------- |
@@ -1098,8 +1097,6 @@ static int acpi_thermal_add(struct acpi_device *device) | |||
1098 | strcpy(acpi_device_name(device), ACPI_THERMAL_DEVICE_NAME); | 1097 | strcpy(acpi_device_name(device), ACPI_THERMAL_DEVICE_NAME); |
1099 | strcpy(acpi_device_class(device), ACPI_THERMAL_CLASS); | 1098 | strcpy(acpi_device_class(device), ACPI_THERMAL_CLASS); |
1100 | device->driver_data = tz; | 1099 | device->driver_data = tz; |
1101 | mutex_init(&tz->lock); | ||
1102 | |||
1103 | 1100 | ||
1104 | result = acpi_thermal_get_info(tz); | 1101 | result = acpi_thermal_get_info(tz); |
1105 | if (result) | 1102 | if (result) |
@@ -1132,7 +1129,6 @@ static int acpi_thermal_remove(struct acpi_device *device) | |||
1132 | tz = acpi_driver_data(device); | 1129 | tz = acpi_driver_data(device); |
1133 | 1130 | ||
1134 | acpi_thermal_unregister_thermal_zone(tz); | 1131 | acpi_thermal_unregister_thermal_zone(tz); |
1135 | mutex_destroy(&tz->lock); | ||
1136 | kfree(tz); | 1132 | kfree(tz); |
1137 | return 0; | 1133 | return 0; |
1138 | } | 1134 | } |