leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwmon: (ibmpowernv) replace AMBIENT_TEMP by TEMP

Browse Source 
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>
This commit is contained in:
Cédric Le Goater
2015-03-19 18:44:41 +01:00
committed by Guenter Roeck
parent d720acace4
commit 96124610e9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/hwmon/ibmpowernv.c
View File

@@ -44,7 +44,7 @@
*/ */
enum sensors { enum sensors {
FAN, FAN,
AMBIENT_TEMP, TEMP,
POWER_SUPPLY, POWER_SUPPLY,
POWER_INPUT, POWER_INPUT,
MAX_SENSOR_TYPE, MAX_SENSOR_TYPE,
@@ -87,7 +87,7 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *devattr,
return ret; return ret;
/* Convert temperature to milli-degrees */ /* Convert temperature to milli-degrees */
if (sdata->type == AMBIENT_TEMP) if (sdata->type == TEMP)
x *= 1000; x *= 1000;
/* Convert power to micro-watts */ /* Convert power to micro-watts */
else if (sdata->type == POWER_INPUT) else if (sdata->type == POWER_INPUT)
@@ -154,7 +154,7 @@ static int create_hwmon_attr_name(struct device *dev, enum sensors type,
} else if (!strcmp(attr_suffix, DT_DATA_ATTR_SUFFIX)) { } else if (!strcmp(attr_suffix, DT_DATA_ATTR_SUFFIX)) {
attr_name = "input"; attr_name = "input";
} else if (!strcmp(attr_suffix, DT_THRESHOLD_ATTR_SUFFIX)) { } else if (!strcmp(attr_suffix, DT_THRESHOLD_ATTR_SUFFIX)) {
if (type == AMBIENT_TEMP) if (type == TEMP)
attr_name = "max"; attr_name = "max";
else if (type == FAN) else if (type == FAN)
attr_name = "min"; attr_name = "min";