2 files changed, 11 insertions, 11 deletions

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 3eba3971dae1..797d14891127 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -745,7 +745,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->cooling_devices,
+                        list_for_each_entry(instance, &tz->thermal_instances,
                                             node) {
                                 if (instance->trip != trip)
                                         continue;
@@ -756,7 +756,7 @@ static void thermal_zone_device_passive(struct thermal_zone_device *tz,
                                         cdev->ops->set_cur_state(cdev, state);
                         }
                 } else if (trend == THERMAL_TREND_DROPPING) { /* Cooling off? */
-                        list_for_each_entry(instance, &tz->cooling_devices,
+                        list_for_each_entry(instance, &tz->thermal_instances,
                                             node) {
                                 if (instance->trip != trip)
                                         continue;
@@ -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->cooling_devices, node) {
+        list_for_each_entry(instance, &tz->thermal_instances, node) {
                 if (instance->trip != trip)
                         continue;
                 cdev = instance->cdev;
@@ -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->cooling_devices, node)
+        list_for_each_entry(pos, &tz->thermal_instances, node)
             if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) {
                 result = -EEXIST;
                 break;
         }
         if (!result)
-                list_add_tail(&dev->node, &tz->cooling_devices);
+                list_add_tail(&dev->node, &tz->thermal_instances);
         mutex_unlock(&tz->lock);
 
         if (!result)
@@ -912,7 +912,7 @@ 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->cooling_devices, node) {
+        list_for_each_entry_safe(pos, next, &tz->thermal_instances, node) {
                 if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) {
                         list_del(&pos->node);
                         mutex_unlock(&tz->lock);
@@ -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->cooling_devices, node) {
+                list_for_each_entry(instance, &tz->thermal_instances, node) {
                         if (instance->trip != trip)
                                 continue;
 
@@ -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->cooling_devices, node) {
+                list_for_each_entry(instance, &tz->thermal_instances, node) {
                         if (instance->trip != trip)
                                 continue;
 
@@ -1365,7 +1365,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
         if (!tz)
                 return ERR_PTR(-ENOMEM);
 
-        INIT_LIST_HEAD(&tz->cooling_devices);
+        INIT_LIST_HEAD(&tz->thermal_instances);
         idr_init(&tz->idr);
         mutex_init(&tz->lock);
         result = get_idr(&thermal_tz_idr, &thermal_idr_lock, &tz->id);
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 38267a595d69..cb0b0e3ffd97 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -122,9 +122,9 @@ struct thermal_zone_device {
         bool passive;
         unsigned int forced_passive;
         const struct thermal_zone_device_ops *ops;
-        struct list_head cooling_devices;
+        struct list_head thermal_instances;
         struct idr idr;
-        struct mutex lock;      /* protect cooling devices list */
+        struct mutex lock; /* protect thermal_instances list */
         struct list_head node;
         struct delayed_work poll_queue;
 };