Commit 1cd1bcee authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds

[PATCH] pmac: don't add °C suffix in sys for adt746x driver

The adt746x driver currently adds a "°C" suffix to temperatures exposed via
sysfs, and I don't like that.  First, we all agree that any other unit here
makes no sense (do we ?  do we ?  yes of course :) and I don't like having
anything but numbers in there, and finally it's more consistent with what
the g5 driver does.

And finally, the _REAL_ reason is that this is not a low ASCII character
and so has nothing to do in the kernel sources or in /sys :)

Unfortunately, generating a patch here is nasty because of that (my mailer
is rightfully complaining about the non-ASCII char on text import) so you
might have to apply by hand...
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9b991c76
...@@ -417,11 +417,6 @@ attach_one_thermostat(struct i2c_adapter *adapter, int addr, int busno) ...@@ -417,11 +417,6 @@ attach_one_thermostat(struct i2c_adapter *adapter, int addr, int busno)
* choice but implement a bunch of them... * choice but implement a bunch of them...
* *
*/ */
#define BUILD_SHOW_FUNC_DEG(name, data) \
static ssize_t show_##name(struct device *dev, char *buf) \
{ \
return sprintf(buf, "%d°C\n", data); \
}
#define BUILD_SHOW_FUNC_INT(name, data) \ #define BUILD_SHOW_FUNC_INT(name, data) \
static ssize_t show_##name(struct device *dev, char *buf) \ static ssize_t show_##name(struct device *dev, char *buf) \
{ \ { \
...@@ -453,10 +448,10 @@ static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \ ...@@ -453,10 +448,10 @@ static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \
return n; \ return n; \
} }
BUILD_SHOW_FUNC_DEG(cpu_temperature, (read_reg(thermostat, TEMP_REG[1]))) BUILD_SHOW_FUNC_INT(cpu_temperature, (read_reg(thermostat, TEMP_REG[1])))
BUILD_SHOW_FUNC_DEG(gpu_temperature, (read_reg(thermostat, TEMP_REG[2]))) BUILD_SHOW_FUNC_INT(gpu_temperature, (read_reg(thermostat, TEMP_REG[2])))
BUILD_SHOW_FUNC_DEG(cpu_limit, thermostat->limits[1]) BUILD_SHOW_FUNC_INT(cpu_limit, thermostat->limits[1])
BUILD_SHOW_FUNC_DEG(gpu_limit, thermostat->limits[2]) BUILD_SHOW_FUNC_INT(gpu_limit, thermostat->limits[2])
BUILD_SHOW_FUNC_INT(specified_fan_speed, fan_speed) BUILD_SHOW_FUNC_INT(specified_fan_speed, fan_speed)
BUILD_SHOW_FUNC_INT(cpu_fan_speed, (read_fan_speed(thermostat, FAN_SPEED[0]))) BUILD_SHOW_FUNC_INT(cpu_fan_speed, (read_fan_speed(thermostat, FAN_SPEED[0])))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment