diff options
| author | Aaron Lu <aaron.lu@intel.com> | 2014-03-24 22:40:09 -0400 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-10-10 01:57:15 -0400 |
| commit | 7b83fd9d91a411158f72d36958103c708c3b5a86 (patch) | |
| tree | 918ae19513e4f3f5553ad31908695cfddef0b921 /drivers/acpi/thermal.c | |
| parent | d806c6e9cdfd6c5663687ec7109e151c0ff66639 (diff) | |
Thermal: move the KELVIN_TO_MILLICELSIUS macro to thermal.h
This macro can be used by other component so move it to a common header,
but in a slightly different way: define two macros, one macro with an
offset and the other doesn't.
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/acpi/thermal.c')
| -rw-r--r-- | drivers/acpi/thermal.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 112817e963e0..d24fa1964eb8 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
| @@ -528,7 +528,6 @@ static void acpi_thermal_check(void *data) | |||
| 528 | } | 528 | } |
| 529 | 529 | ||
| 530 | /* sys I/F for generic thermal sysfs support */ | 530 | /* sys I/F for generic thermal sysfs support */ |
| 531 | #define KELVIN_TO_MILLICELSIUS(t, off) (((t) - (off)) * 100) | ||
| 532 | 531 | ||
| 533 | static int thermal_get_temp(struct thermal_zone_device *thermal, | 532 | static int thermal_get_temp(struct thermal_zone_device *thermal, |
| 534 | unsigned long *temp) | 533 | unsigned long *temp) |
| @@ -543,7 +542,8 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, | |||
| 543 | if (result) | 542 | if (result) |
| 544 | return result; | 543 | return result; |
| 545 | 544 | ||
| 546 | *temp = KELVIN_TO_MILLICELSIUS(tz->temperature, tz->kelvin_offset); | 545 | *temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(tz->temperature, |
| 546 | tz->kelvin_offset); | ||
| 547 | return 0; | 547 | return 0; |
| 548 | } | 548 | } |
| 549 | 549 | ||
| @@ -647,7 +647,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, | |||
| 647 | 647 | ||
| 648 | if (tz->trips.critical.flags.valid) { | 648 | if (tz->trips.critical.flags.valid) { |
| 649 | if (!trip) { | 649 | if (!trip) { |
| 650 | *temp = KELVIN_TO_MILLICELSIUS( | 650 | *temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( |
| 651 | tz->trips.critical.temperature, | 651 | tz->trips.critical.temperature, |
| 652 | tz->kelvin_offset); | 652 | tz->kelvin_offset); |
| 653 | return 0; | 653 | return 0; |
| @@ -657,7 +657,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, | |||
| 657 | 657 | ||
| 658 | if (tz->trips.hot.flags.valid) { | 658 | if (tz->trips.hot.flags.valid) { |
| 659 | if (!trip) { | 659 | if (!trip) { |
| 660 | *temp = KELVIN_TO_MILLICELSIUS( | 660 | *temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( |
| 661 | tz->trips.hot.temperature, | 661 | tz->trips.hot.temperature, |
| 662 | tz->kelvin_offset); | 662 | tz->kelvin_offset); |
| 663 | return 0; | 663 | return 0; |
| @@ -667,7 +667,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, | |||
| 667 | 667 | ||
| 668 | if (tz->trips.passive.flags.valid) { | 668 | if (tz->trips.passive.flags.valid) { |
| 669 | if (!trip) { | 669 | if (!trip) { |
| 670 | *temp = KELVIN_TO_MILLICELSIUS( | 670 | *temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( |
| 671 | tz->trips.passive.temperature, | 671 | tz->trips.passive.temperature, |
| 672 | tz->kelvin_offset); | 672 | tz->kelvin_offset); |
| 673 | return 0; | 673 | return 0; |
| @@ -678,7 +678,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, | |||
| 678 | for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE && | 678 | for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE && |
| 679 | tz->trips.active[i].flags.valid; i++) { | 679 | tz->trips.active[i].flags.valid; i++) { |
| 680 | if (!trip) { | 680 | if (!trip) { |
| 681 | *temp = KELVIN_TO_MILLICELSIUS( | 681 | *temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( |
| 682 | tz->trips.active[i].temperature, | 682 | tz->trips.active[i].temperature, |
| 683 | tz->kelvin_offset); | 683 | tz->kelvin_offset); |
| 684 | return 0; | 684 | return 0; |
| @@ -694,7 +694,7 @@ static int thermal_get_crit_temp(struct thermal_zone_device *thermal, | |||
| 694 | struct acpi_thermal *tz = thermal->devdata; | 694 | struct acpi_thermal *tz = thermal->devdata; |
| 695 | 695 | ||
| 696 | if (tz->trips.critical.flags.valid) { | 696 | if (tz->trips.critical.flags.valid) { |
| 697 | *temperature = KELVIN_TO_MILLICELSIUS( | 697 | *temperature = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( |
| 698 | tz->trips.critical.temperature, | 698 | tz->trips.critical.temperature, |
| 699 | tz->kelvin_offset); | 699 | tz->kelvin_offset); |
| 700 | return 0; | 700 | return 0; |
| @@ -714,8 +714,8 @@ static int thermal_get_trend(struct thermal_zone_device *thermal, | |||
| 714 | 714 | ||
| 715 | if (type == THERMAL_TRIP_ACTIVE) { | 715 | if (type == THERMAL_TRIP_ACTIVE) { |
| 716 | unsigned long trip_temp; | 716 | unsigned long trip_temp; |
| 717 | unsigned long temp = KELVIN_TO_MILLICELSIUS(tz->temperature, | 717 | unsigned long temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( |
| 718 | tz->kelvin_offset); | 718 | tz->temperature, tz->kelvin_offset); |
| 719 | if (thermal_get_trip_temp(thermal, trip, &trip_temp)) | 719 | if (thermal_get_trip_temp(thermal, trip, &trip_temp)) |
| 720 | return -EINVAL; | 720 | return -EINVAL; |
| 721 | 721 | ||