summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/thermal/thermal_core.c10
-rw-r--r--drivers/thermal/thermal_core.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 4f0eafda9349..e3cd8cd3502b 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -414,13 +414,13 @@ static void add_trip_to_sorted_list(struct thermal_trip_desc *td,
struct thermal_trip_desc *entry;
/* Assume that the new entry is likely to be the last one. */
- list_for_each_entry_reverse(entry, list, notify_list_node) {
+ list_for_each_entry_reverse(entry, list, list_node) {
if (entry->notify_temp <= td->notify_temp) {
- list_add(&td->notify_list_node, &entry->notify_list_node);
+ list_add(&td->list_node, &entry->list_node);
return;
}
}
- list_add(&td->notify_list_node, list);
+ list_add(&td->list_node, list);
}
static void handle_thermal_trip(struct thermal_zone_device *tz,
@@ -586,10 +586,10 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
thermal_zone_set_trips(tz, low, high);
- list_for_each_entry(td, &way_up_list, notify_list_node)
+ list_for_each_entry(td, &way_up_list, list_node)
thermal_trip_crossed(tz, &td->trip, governor, true);
- list_for_each_entry_reverse(td, &way_down_list, notify_list_node)
+ list_for_each_entry_reverse(td, &way_down_list, list_node)
thermal_trip_crossed(tz, &td->trip, governor, false);
if (governor->manage)
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index 04d45cd97614..553ce4d13192 100644
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -31,7 +31,7 @@ struct thermal_trip_attrs {
struct thermal_trip_desc {
struct thermal_trip trip;
struct thermal_trip_attrs trip_attrs;
- struct list_head notify_list_node;
+ struct list_head list_node;
struct list_head thermal_instances;
int notify_temp;
int threshold;