diff options
author | Cédric Le Goater <clg@fr.ibm.com> | 2015-03-19 13:44:41 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2015-03-20 11:23:26 -0400 |
commit | 96124610e9f154135eb6fd9aa7a78ed756ff18a3 (patch) | |
tree | 03e887833bdf646a9e2df6241d84cfbda2160803 | |
parent | d720acace4d7989f0d5617868e8277221e882961 (diff) |
hwmon: (ibmpowernv) replace AMBIENT_TEMP by TEMP
Ambient is too restrictive as there can be other temperature channels :
core, memory, etc.
Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r-- | drivers/hwmon/ibmpowernv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c index febe8175d36c..f691e18df16b 100644 --- a/drivers/hwmon/ibmpowernv.c +++ b/drivers/hwmon/ibmpowernv.c | |||
@@ -44,7 +44,7 @@ | |||
44 | */ | 44 | */ |
45 | enum sensors { | 45 | enum sensors { |
46 | FAN, | 46 | FAN, |
47 | AMBIENT_TEMP, | 47 | TEMP, |
48 | POWER_SUPPLY, | 48 | POWER_SUPPLY, |
49 | POWER_INPUT, | 49 | POWER_INPUT, |
50 | MAX_SENSOR_TYPE, | 50 | MAX_SENSOR_TYPE, |
@@ -87,7 +87,7 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *devattr, | |||
87 | return ret; | 87 | return ret; |
88 | 88 | ||
89 | /* Convert temperature to milli-degrees */ | 89 | /* Convert temperature to milli-degrees */ |
90 | if (sdata->type == AMBIENT_TEMP) | 90 | if (sdata->type == TEMP) |
91 | x *= 1000; | 91 | x *= 1000; |
92 | /* Convert power to micro-watts */ | 92 | /* Convert power to micro-watts */ |
93 | else if (sdata->type == POWER_INPUT) | 93 | else if (sdata->type == POWER_INPUT) |
@@ -154,7 +154,7 @@ static int create_hwmon_attr_name(struct device *dev, enum sensors type, | |||
154 | } else if (!strcmp(attr_suffix, DT_DATA_ATTR_SUFFIX)) { | 154 | } else if (!strcmp(attr_suffix, DT_DATA_ATTR_SUFFIX)) { |
155 | attr_name = "input"; | 155 | attr_name = "input"; |
156 | } else if (!strcmp(attr_suffix, DT_THRESHOLD_ATTR_SUFFIX)) { | 156 | } else if (!strcmp(attr_suffix, DT_THRESHOLD_ATTR_SUFFIX)) { |
157 | if (type == AMBIENT_TEMP) | 157 | if (type == TEMP) |
158 | attr_name = "max"; | 158 | attr_name = "max"; |
159 | else if (type == FAN) | 159 | else if (type == FAN) |
160 | attr_name = "min"; | 160 | attr_name = "min"; |