diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2008-01-17 15:51:19 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-01 23:20:26 -0500 |
| commit | 041d4bbf128f645fe53bb22309efb9db14dbf5b5 (patch) | |
| tree | 2599aff53ec6e492c202f6db88deee7ea988575c | |
| parent | 207339398ecb0835331c748612898dad2a09fdec (diff) | |
| download | talos-obmc-linux-041d4bbf128f645fe53bb22309efb9db14dbf5b5.tar.gz talos-obmc-linux-041d4bbf128f645fe53bb22309efb9db14dbf5b5.zip | |
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>
| -rw-r--r-- | drivers/acpi/thermal.c | 3 | ||||
| -rw-r--r-- | include/linux/thermal.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 740036355722..aee371f9daf8 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -65,9 +65,6 @@ #define ACPI_THERMAL_MAX_ACTIVE 10 #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 ACPI_MODULE_NAME("thermal"); diff --git a/include/linux/thermal.h b/include/linux/thermal.h index e4b76c7afb51..bba7712cadc7 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -61,6 +61,10 @@ struct thermal_cooling_device { 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 { int id; char type[THERMAL_NAME_LENGTH]; |
