Browse Source

ACPI: CELSIUS_TO_KELVIN fixup

Fix an imprecision in CELSIUS_TO_KELVIN and move these
two macroes to a proper place.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Thomas Sujith <sujith.thomas@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Zhang Rui 17 years ago
parent
commit
041d4bbf12
2 changed files with 4 additions and 3 deletions
  1. 0 3
      drivers/acpi/thermal.c
  2. 4 0
      include/linux/thermal.h

+ 0 - 3
drivers/acpi/thermal.c

@@ -65,9 +65,6 @@
 #define ACPI_THERMAL_MAX_ACTIVE	10
 #define ACPI_THERMAL_MAX_ACTIVE	10
 #define ACPI_THERMAL_MAX_LIMIT_STR_LEN 65
 #define ACPI_THERMAL_MAX_LIMIT_STR_LEN 65
 
 
-#define KELVIN_TO_CELSIUS(t)    (long)(((long)t-2732>=0) ? ((long)t-2732+5)/10 : ((long)t-2732-5)/10)
-#define CELSIUS_TO_KELVIN(t)	((t+273)*10)
-
 #define _COMPONENT		ACPI_THERMAL_COMPONENT
 #define _COMPONENT		ACPI_THERMAL_COMPONENT
 ACPI_MODULE_NAME("thermal");
 ACPI_MODULE_NAME("thermal");
 
 

+ 4 - 0
include/linux/thermal.h

@@ -61,6 +61,10 @@ struct thermal_cooling_device {
 	struct list_head node;
 	struct list_head node;
 };
 };
 
 
+#define KELVIN_TO_CELSIUS(t)	(long)(((long)t-2732 >= 0) ?	\
+				((long)t-2732+5)/10 : ((long)t-2732-5)/10)
+#define CELSIUS_TO_KELVIN(t)	((t)*10+2732)
+
 struct thermal_zone_device {
 struct thermal_zone_device {
 	int id;
 	int id;
 	char type[THERMAL_NAME_LENGTH];
 	char type[THERMAL_NAME_LENGTH];