Skip to contentSkip to conversation

pmac: don't add "°C" suffix in sys for adt746x driver

PATCH In review Benjamin Herrenschmidt 5 participants 7 messages Sep 17, 2004 – Sep 21, 2004

Subsystems (2)
Linux for power macintosh ADT746X fan driver
lore
Share & tools
lore

Benjamin Herrenschmidt

author
#0 lore raw

PATCH 1/1 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 Benjamin Herrenschmidt <[email protected]>

(attached, evolution will really not let me paste that bit in)

===== drivers/macintosh/therm_adt746x.c 1.4 vs edited =====

drivers/macintosh/therm_adt746x.c +4 -9
@@ -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])))
#1 lore raw
Quoted 3 lines · Benjamin Herrenschmidt

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

Universal temperature, in K? And you'll never ever see negative numbers ;-)

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

author
#2 lore raw
Quoted 6 lines · Geert Uytterhoeven
Quoted 3 lines · Benjamin Herrenschmidt

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

Universal temperature, in K? And you'll never ever see negative numbers ;-)

I was waiting for this one :)

Ben.

#3 lore raw

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

In reply to Geert Uytterhoeven
Quoted 6 lines · Geert Uytterhoeven
Quoted 3 lines · Benjamin Herrenschmidt

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

Universal temperature, in K? And you'll never ever see negative numbers ;-)

It's called Absolute Temperature, (Kelvins for thos who dont know) :-)

Sorry for the nerdy comment, can't help it

Max

Signature · 8 lines
Linux garaged 2.6.9-rc1-mm1 #3 SMP Mon Aug 30 12:14:50 CDT 2004 i686 Intel(R) 
Pentium(R) 4 CPU 2.80GHz GenuineIntel GNU/Linux
-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
GS/S d- s: a-29 C++(+++) ULAHI+++ P+ L++>+++ E--- W++ N* o-- K- w++++ O- M-- 
V-- PS+ PE Y-- PGP++ t- 5- X+ R tv++ b+ DI+++ D- G++ e++ h+ r+ z**
------END GEEK CODE BLOCK------
gpg-key: http://garaged.homeip.net/gpg-key.txt
#4 lore raw

Salut,

Quoted 2 lines · Max Valdez
Quoted 1 line

Universal temperature, in K? And you'll never ever see negative numbers ;-)

It's called Absolute Temperature, (Kelvins for thos who dont know) :-)

Or degree of Brownian Movement. Absolute temperature is not really an unique identifier.

Tonnerre

#5 lore raw

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

Quoted 10 lines · Tonnerre

Salut,

Quoted 4 lines · Max Valdez
Quoted 2 lines

Universal temperature, in K? And you'll never ever see negative numbers ;-)

It's called Absolute Temperature, (Kelvins for thos who dont know) :-)

Or degree of Brownian Movement. Absolute temperature is not really an unique identifier.

Actually Brownian Motion, and Molecular Dynamics in general depends on Temperature, and that dependency gave out the idea of an "Absolute Temperature" wich is quite handy when making computations on gases, and the whole molecular simulation theory.

When it comes to electrons temperature afects, but don't determines movement, but for the mecanics of molecules and the suchs temperature is one of the most important variables.

Max

Signature · 8 lines
Linux garaged 2.6.9-rc1-mm1 #3 SMP Mon Aug 30 12:14:50 CDT 2004 i686 Intel(R) 
Pentium(R) 4 CPU 2.80GHz GenuineIntel GNU/Linux
-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
GS/S d- s: a-29 C++(+++) ULAHI+++ P+ L++>+++ E--- W++ N* o-- K- w++++ O- M-- 
V-- PS+ PE Y-- PGP++ t- 5- X+ R tv++ b+ DI+++ D- G++ e++ h+ r+ z**
------END GEEK CODE BLOCK------
gpg-key: http://garaged.homeip.net/gpg-key.txt
maintainer
#6 lore raw
In reply to Benjamin Herrenschmidt

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

Hi,

Quoted 8 lines

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 <[email protected]>
Signed-off-by Colin Leroy <[email protected]>

===== drivers/macintosh/therm_adt746x.c 1.4 vs edited =====

drivers/macintosh/therm_adt746x.c +4 -9
@@ -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])))
Signature · 1 line
Colin