diff options
Diffstat (limited to 'drivers/acpi/thermal.c')
-rw-r--r-- | drivers/acpi/thermal.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index fc28b9f5aa84..30d8518b25fb 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
@@ -525,8 +525,7 @@ static void acpi_thermal_check(void *data) | |||
525 | 525 | ||
526 | /* sys I/F for generic thermal sysfs support */ | 526 | /* sys I/F for generic thermal sysfs support */ |
527 | 527 | ||
528 | static int thermal_get_temp(struct thermal_zone_device *thermal, | 528 | static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp) |
529 | unsigned long *temp) | ||
530 | { | 529 | { |
531 | struct acpi_thermal *tz = thermal->devdata; | 530 | struct acpi_thermal *tz = thermal->devdata; |
532 | int result; | 531 | int result; |
@@ -633,7 +632,7 @@ static int thermal_get_trip_type(struct thermal_zone_device *thermal, | |||
633 | } | 632 | } |
634 | 633 | ||
635 | static int thermal_get_trip_temp(struct thermal_zone_device *thermal, | 634 | static int thermal_get_trip_temp(struct thermal_zone_device *thermal, |
636 | int trip, unsigned long *temp) | 635 | int trip, int *temp) |
637 | { | 636 | { |
638 | struct acpi_thermal *tz = thermal->devdata; | 637 | struct acpi_thermal *tz = thermal->devdata; |
639 | int i; | 638 | int i; |
@@ -686,7 +685,8 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, | |||
686 | } | 685 | } |
687 | 686 | ||
688 | static int thermal_get_crit_temp(struct thermal_zone_device *thermal, | 687 | static int thermal_get_crit_temp(struct thermal_zone_device *thermal, |
689 | unsigned long *temperature) { | 688 | int *temperature) |
689 | { | ||
690 | struct acpi_thermal *tz = thermal->devdata; | 690 | struct acpi_thermal *tz = thermal->devdata; |
691 | 691 | ||
692 | if (tz->trips.critical.flags.valid) { | 692 | if (tz->trips.critical.flags.valid) { |
@@ -709,8 +709,8 @@ static int thermal_get_trend(struct thermal_zone_device *thermal, | |||
709 | return -EINVAL; | 709 | return -EINVAL; |
710 | 710 | ||
711 | if (type == THERMAL_TRIP_ACTIVE) { | 711 | if (type == THERMAL_TRIP_ACTIVE) { |
712 | unsigned long trip_temp; | 712 | int trip_temp; |
713 | unsigned long temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( | 713 | int temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET( |
714 | tz->temperature, tz->kelvin_offset); | 714 | tz->temperature, tz->kelvin_offset); |
715 | if (thermal_get_trip_temp(thermal, trip, &trip_temp)) | 715 | if (thermal_get_trip_temp(thermal, trip, &trip_temp)) |
716 | return -EINVAL; | 716 | return -EINVAL; |