From e33a35411858ab4aa1add5a79a8a436e6a0c808b Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Thu, 17 Jan 2008 15:51:19 +0800 Subject: [PATCH] --- yaml --- r: 84146 b: refs/heads/master c: 041d4bbf128f645fe53bb22309efb9db14dbf5b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/thermal.c | 3 --- trunk/include/linux/thermal.h | 4 ++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 12a84bd98301..83cc516dc429 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 207339398ecb0835331c748612898dad2a09fdec +refs/heads/master: 041d4bbf128f645fe53bb22309efb9db14dbf5b5 diff --git a/trunk/drivers/acpi/thermal.c b/trunk/drivers/acpi/thermal.c index 740036355722..aee371f9daf8 100644 --- a/trunk/drivers/acpi/thermal.c +++ b/trunk/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/trunk/include/linux/thermal.h b/trunk/include/linux/thermal.h index e4b76c7afb51..bba7712cadc7 100644 --- a/trunk/include/linux/thermal.h +++ b/trunk/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];