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

[Colin Leroy <colin@colino.net>]

On 17 Sep 2004 at 16h09, Benjamin Herrenschmidt wrote:

Hi, 

> 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 :)

Fine with me!  (Patch may be broken too...)

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Colin Leroy <colin@colino.net>
===== drivers/macintosh/therm_adt746x.c 1.4 vs edited =====
--- 1.4/drivers/macintosh/therm_adt746x.c	2004-05-29 17:26:34 +10:00
+++ edited/drivers/macintosh/therm_adt746x.c	2004-09-17 15:59:59 +10:00
@@ -417,11 +417,6 @@
  * 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)				\
 static ssize_t show_##name(struct device *dev, char *buf)	\
 {								\
@@ -453,10 +448,10 @@
 	return n;						\
 }
 
-BUILD_SHOW_FUNC_DEG(cpu_temperature,	 (read_reg(thermostat, TEMP_REG[1])))
-BUILD_SHOW_FUNC_DEG(gpu_temperature,	 (read_reg(thermostat, TEMP_REG[2])))
-BUILD_SHOW_FUNC_DEG(cpu_limit,		 thermostat->limits[1])
-BUILD_SHOW_FUNC_DEG(gpu_limit,		 thermostat->limits[2])
+BUILD_SHOW_FUNC_INT(cpu_temperature,	 (read_reg(thermostat, TEMP_REG[1])))
+BUILD_SHOW_FUNC_INT(gpu_temperature,	 (read_reg(thermostat, TEMP_REG[2])))
+BUILD_SHOW_FUNC_INT(cpu_limit,		 thermostat->limits[1])
+BUILD_SHOW_FUNC_INT(gpu_limit,		 thermostat->limits[2])
 
 BUILD_SHOW_FUNC_INT(specified_fan_speed, fan_speed)
 BUILD_SHOW_FUNC_INT(cpu_fan_speed,	 (read_fan_speed(thermostat, FAN_SPEED[0])))
-- 
Colin