diff options
| author | Cédric Le Goater <clg@fr.ibm.com> | 2015-03-19 18:44:41 +0100 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2015-03-20 16:23:26 +0100 |
| commit | 96124610e9f154135eb6fd9aa7a78ed756ff18a3 (patch) | |
| tree | 03e887833bdf646a9e2df6241d84cfbda2160803 /drivers/hwmon | |
| parent | hwmon: (pwm-fan, vexpress) Constify of_device_id array (diff) | |
| download | linux-96124610e9f154135eb6fd9aa7a78ed756ff18a3.tar.xz linux-96124610e9f154135eb6fd9aa7a78ed756ff18a3.zip | |
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>
Diffstat (limited to 'drivers/hwmon')
| -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 @@ */ enum sensors { FAN, - AMBIENT_TEMP, + TEMP, POWER_SUPPLY, POWER_INPUT, MAX_SENSOR_TYPE, @@ -87,7 +87,7 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *devattr, return ret; /* Convert temperature to milli-degrees */ - if (sdata->type == AMBIENT_TEMP) + if (sdata->type == TEMP) x *= 1000; /* Convert power to micro-watts */ 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)) { attr_name = "input"; } else if (!strcmp(attr_suffix, DT_THRESHOLD_ATTR_SUFFIX)) { - if (type == AMBIENT_TEMP) + if (type == TEMP) attr_name = "max"; else if (type == FAN) attr_name = "min"; |