Skip to content

Commit

Permalink
Thermal: Rename thermal_instance.node to thermal_instance.tz_node.
Browse files Browse the repository at this point in the history
thermal_instance should be referenced by both thermal zone devices
and thermal cooling devices.

Rename thermal_instance.node to thermal_instance.tz_node in this patch
and thermal_instanace.cdev_node will be introduced in next patch.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Rafael J. Wysocki <rjw@sisk.pl>
Reviewed-by: Eduardo Valentin <eduardo.valentin@ti.com>
  • Loading branch information
Zhang Rui committed Sep 24, 2012
1 parent 2d37413 commit cddf31b
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/thermal/thermal_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct thermal_instance {
unsigned long lower; /* Lowest cooling state for this trip point */
char attr_name[THERMAL_NAME_LENGTH];
struct device_attribute attr;
struct list_head node;
struct list_head tz_node; /* node in tz->thermal_instances */
};

static DEFINE_IDR(thermal_tz_idr);
Expand Down Expand Up @@ -746,7 +746,7 @@ static void thermal_zone_device_passive(struct thermal_zone_device *tz,
/* Heating up? */
if (trend == THERMAL_TREND_RAISING) {
list_for_each_entry(instance, &tz->thermal_instances,
node) {
tz_node) {
if (instance->trip != trip)
continue;
cdev = instance->cdev;
Expand All @@ -757,7 +757,7 @@ static void thermal_zone_device_passive(struct thermal_zone_device *tz,
}
} else if (trend == THERMAL_TREND_DROPPING) { /* Cooling off? */
list_for_each_entry(instance, &tz->thermal_instances,
node) {
tz_node) {
if (instance->trip != trip)
continue;
cdev = instance->cdev;
Expand All @@ -777,7 +777,7 @@ static void thermal_zone_device_passive(struct thermal_zone_device *tz,
* and avoid thrashing around the passive trip point. Note that we
* assume symmetry.
*/
list_for_each_entry(instance, &tz->thermal_instances, node) {
list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
if (instance->trip != trip)
continue;
cdev = instance->cdev;
Expand Down Expand Up @@ -873,13 +873,13 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
goto remove_symbol_link;

mutex_lock(&tz->lock);
list_for_each_entry(pos, &tz->thermal_instances, node)
list_for_each_entry(pos, &tz->thermal_instances, tz_node)
if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) {
result = -EEXIST;
break;
}
if (!result)
list_add_tail(&dev->node, &tz->thermal_instances);
list_add_tail(&dev->tz_node, &tz->thermal_instances);
mutex_unlock(&tz->lock);

if (!result)
Expand Down Expand Up @@ -912,9 +912,9 @@ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz,
struct thermal_instance *pos, *next;

mutex_lock(&tz->lock);
list_for_each_entry_safe(pos, next, &tz->thermal_instances, node) {
list_for_each_entry_safe(pos, next, &tz->thermal_instances, tz_node) {
if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) {
list_del(&pos->node);
list_del(&pos->tz_node);
mutex_unlock(&tz->lock);
goto unbind;
}
Expand Down Expand Up @@ -1117,7 +1117,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
}

if (temp >= trip_temp) {
list_for_each_entry(instance, &tz->thermal_instances, node) {
list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
if (instance->trip != trip)
continue;

Expand All @@ -1136,7 +1136,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
cdev->ops->set_cur_state(cdev, cur_state);
}
} else { /* below trip */
list_for_each_entry(instance, &tz->thermal_instances, node) {
list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
if (instance->trip != trip)
continue;

Expand Down

0 comments on commit cddf31b

Please sign in to comment.