aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2012-06-26 22:08:19 -0400
committerZhang Rui <rui.zhang@intel.com>2012-09-24 02:44:37 -0400
commitb81b6ba3d9ac5feb14388bb73ac5a39d9a7540dc (patch)
tree02dfdca3257a5540c1d20b8d5ed460bb56b403c8 /drivers/thermal
parent4ae46befb49d4173122e0afa995c4e93d01948a2 (diff)
Thermal: rename structure thermal_cooling_device_instance to thermal_instance
This struct is used to describe the behavior for a thermal cooling device on a certain trip point for a certain thremal zone. thermal_cooling_device_instance is not accurate, as a cooling device can be used for more than one trip point in one thermal zone device. 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>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/thermal_sys.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 735e6e6daada..3eba3971dae1 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -46,7 +46,7 @@ MODULE_LICENSE("GPL");
46 * a certain cooling device on a certain trip point 46 * a certain cooling device on a certain trip point
47 * in a certain thermal zone 47 * in a certain thermal zone
48 */ 48 */
49struct thermal_cooling_device_instance { 49struct thermal_instance {
50 int id; 50 int id;
51 char name[THERMAL_NAME_LENGTH]; 51 char name[THERMAL_NAME_LENGTH];
52 struct thermal_zone_device *tz; 52 struct thermal_zone_device *tz;
@@ -430,10 +430,10 @@ static ssize_t
430thermal_cooling_device_trip_point_show(struct device *dev, 430thermal_cooling_device_trip_point_show(struct device *dev,
431 struct device_attribute *attr, char *buf) 431 struct device_attribute *attr, char *buf)
432{ 432{
433 struct thermal_cooling_device_instance *instance; 433 struct thermal_instance *instance;
434 434
435 instance = 435 instance =
436 container_of(attr, struct thermal_cooling_device_instance, attr); 436 container_of(attr, struct thermal_instance, attr);
437 437
438 if (instance->trip == THERMAL_TRIPS_NONE) 438 if (instance->trip == THERMAL_TRIPS_NONE)
439 return sprintf(buf, "-1\n"); 439 return sprintf(buf, "-1\n");
@@ -716,7 +716,7 @@ static void thermal_zone_device_passive(struct thermal_zone_device *tz,
716 int temp, int trip_temp, int trip) 716 int temp, int trip_temp, int trip)
717{ 717{
718 enum thermal_trend trend; 718 enum thermal_trend trend;
719 struct thermal_cooling_device_instance *instance; 719 struct thermal_instance *instance;
720 struct thermal_cooling_device *cdev; 720 struct thermal_cooling_device *cdev;
721 long state, max_state; 721 long state, max_state;
722 722
@@ -812,8 +812,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
812 struct thermal_cooling_device *cdev, 812 struct thermal_cooling_device *cdev,
813 unsigned long upper, unsigned long lower) 813 unsigned long upper, unsigned long lower)
814{ 814{
815 struct thermal_cooling_device_instance *dev; 815 struct thermal_instance *dev;
816 struct thermal_cooling_device_instance *pos; 816 struct thermal_instance *pos;
817 struct thermal_zone_device *pos1; 817 struct thermal_zone_device *pos1;
818 struct thermal_cooling_device *pos2; 818 struct thermal_cooling_device *pos2;
819 unsigned long max_state; 819 unsigned long max_state;
@@ -844,7 +844,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
844 return -EINVAL; 844 return -EINVAL;
845 845
846 dev = 846 dev =
847 kzalloc(sizeof(struct thermal_cooling_device_instance), GFP_KERNEL); 847 kzalloc(sizeof(struct thermal_instance), GFP_KERNEL);
848 if (!dev) 848 if (!dev)
849 return -ENOMEM; 849 return -ENOMEM;
850 dev->tz = tz; 850 dev->tz = tz;
@@ -909,7 +909,7 @@ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz,
909 int trip, 909 int trip,
910 struct thermal_cooling_device *cdev) 910 struct thermal_cooling_device *cdev)
911{ 911{
912 struct thermal_cooling_device_instance *pos, *next; 912 struct thermal_instance *pos, *next;
913 913
914 mutex_lock(&tz->lock); 914 mutex_lock(&tz->lock);
915 list_for_each_entry_safe(pos, next, &tz->cooling_devices, node) { 915 list_for_each_entry_safe(pos, next, &tz->cooling_devices, node) {
@@ -1095,7 +1095,7 @@ EXPORT_SYMBOL(thermal_cooling_device_unregister);
1095static void thermal_zone_trip_update(struct thermal_zone_device *tz, 1095static void thermal_zone_trip_update(struct thermal_zone_device *tz,
1096 int trip, long temp) 1096 int trip, long temp)
1097{ 1097{
1098 struct thermal_cooling_device_instance *instance; 1098 struct thermal_instance *instance;
1099 struct thermal_cooling_device *cdev = NULL; 1099 struct thermal_cooling_device *cdev = NULL;
1100 unsigned long cur_state, max_state; 1100 unsigned long cur_state, max_state;
1101 long trip_temp; 1101 long trip_temp;