Skip to content

Commit 7f49a5c

Browse files
mitatorvalds
mita
authored and
torvalds
committed
ACPI: thermal: switch to use <linux/units.h> helpers
This switches the ACPI thermal zone driver to use celsius_to_deci_kelvin(), deci_kelvin_to_celsius(), and deci_kelvin_to_millicelsius_with_offset() in <linux/units.h> instead of helpers in <linux/thermal.h>. This is preparation for centralizing the kelvin to/from Celsius conversion helpers in <linux/units.h>. Link: http://lkml.kernel.org/r/1576386975-7941-3-git-send-email-akinobu.mita@gmail.com Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Sujith Thomas <sujith.thomas@intel.com> Cc: Darren Hart <dvhart@infradead.org> Cc: Andy Shevchenko <andy@infradead.org> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Amit Kucheria <amit.kucheria@verdurent.com> Cc: Jean Delvare <jdelvare@suse.com> Cc: Guenter Roeck <linux@roeck-us.net> Cc: Keith Busch <kbusch@kernel.org> Cc: Jens Axboe <axboe@fb.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Sagi Grimberg <sagi@grimberg.me> Cc: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Cc: Hartmut Knaack <knaack.h@gmx.de> Cc: Johannes Berg <johannes.berg@intel.com> Cc: Jonathan Cameron <jic23@kernel.org> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: Kalle Valo <kvalo@codeaurora.org> Cc: Lars-Peter Clausen <lars@metafoo.de> Cc: Luca Coelho <luciano.coelho@intel.com> Cc: Peter Meerwald-Stadler <pmeerw@pmeerw.net> Cc: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 23331e4 commit 7f49a5c

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

‎drivers/acpi/thermal.c

+18-16
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <linux/acpi.h>
2828
#include <linux/workqueue.h>
2929
#include <linux/uaccess.h>
30+
#include <linux/units.h>
3031

3132
#define PREFIX "ACPI: "
3233

@@ -172,7 +173,7 @@ struct acpi_thermal {
172173
struct acpi_handle_list devices;
173174
struct thermal_zone_device *thermal_zone;
174175
int tz_enabled;
175-
int kelvin_offset;
176+
int kelvin_offset; /* in millidegrees */
176177
struct work_struct thermal_check_work;
177178
};
178179

@@ -297,7 +298,8 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
297298
if (crt == -1) {
298299
tz->trips.critical.flags.valid = 0;
299300
} else if (crt > 0) {
300-
unsigned long crt_k = CELSIUS_TO_DECI_KELVIN(crt);
301+
unsigned long crt_k = celsius_to_deci_kelvin(crt);
302+
301303
/*
302304
* Allow override critical threshold
303305
*/
@@ -333,7 +335,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
333335
if (psv == -1) {
334336
status = AE_SUPPORT;
335337
} else if (psv > 0) {
336-
tmp = CELSIUS_TO_DECI_KELVIN(psv);
338+
tmp = celsius_to_deci_kelvin(psv);
337339
status = AE_OK;
338340
} else {
339341
status = acpi_evaluate_integer(tz->device->handle,
@@ -413,17 +415,17 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
413415
break;
414416
if (i == 1)
415417
tz->trips.active[0].temperature =
416-
CELSIUS_TO_DECI_KELVIN(act);
418+
celsius_to_deci_kelvin(act);
417419
else
418420
/*
419421
* Don't allow override higher than
420422
* the next higher trip point
421423
*/
422424
tz->trips.active[i - 1].temperature =
423425
(tz->trips.active[i - 2].temperature <
424-
CELSIUS_TO_DECI_KELVIN(act) ?
426+
celsius_to_deci_kelvin(act) ?
425427
tz->trips.active[i - 2].temperature :
426-
CELSIUS_TO_DECI_KELVIN(act));
428+
celsius_to_deci_kelvin(act));
427429
break;
428430
} else {
429431
tz->trips.active[i].temperature = tmp;
@@ -519,7 +521,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, int *temp)
519521
if (result)
520522
return result;
521523

522-
*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(tz->temperature,
524+
*temp = deci_kelvin_to_millicelsius_with_offset(tz->temperature,
523525
tz->kelvin_offset);
524526
return 0;
525527
}
@@ -624,7 +626,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
624626

625627
if (tz->trips.critical.flags.valid) {
626628
if (!trip) {
627-
*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(
629+
*temp = deci_kelvin_to_millicelsius_with_offset(
628630
tz->trips.critical.temperature,
629631
tz->kelvin_offset);
630632
return 0;
@@ -634,7 +636,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
634636

635637
if (tz->trips.hot.flags.valid) {
636638
if (!trip) {
637-
*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(
639+
*temp = deci_kelvin_to_millicelsius_with_offset(
638640
tz->trips.hot.temperature,
639641
tz->kelvin_offset);
640642
return 0;
@@ -644,7 +646,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
644646

645647
if (tz->trips.passive.flags.valid) {
646648
if (!trip) {
647-
*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(
649+
*temp = deci_kelvin_to_millicelsius_with_offset(
648650
tz->trips.passive.temperature,
649651
tz->kelvin_offset);
650652
return 0;
@@ -655,7 +657,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
655657
for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE &&
656658
tz->trips.active[i].flags.valid; i++) {
657659
if (!trip) {
658-
*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(
660+
*temp = deci_kelvin_to_millicelsius_with_offset(
659661
tz->trips.active[i].temperature,
660662
tz->kelvin_offset);
661663
return 0;
@@ -672,7 +674,7 @@ static int thermal_get_crit_temp(struct thermal_zone_device *thermal,
672674
struct acpi_thermal *tz = thermal->devdata;
673675

674676
if (tz->trips.critical.flags.valid) {
675-
*temperature = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(
677+
*temperature = deci_kelvin_to_millicelsius_with_offset(
676678
tz->trips.critical.temperature,
677679
tz->kelvin_offset);
678680
return 0;
@@ -692,7 +694,7 @@ static int thermal_get_trend(struct thermal_zone_device *thermal,
692694

693695
if (type == THERMAL_TRIP_ACTIVE) {
694696
int trip_temp;
695-
int temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(
697+
int temp = deci_kelvin_to_millicelsius_with_offset(
696698
tz->temperature, tz->kelvin_offset);
697699
if (thermal_get_trip_temp(thermal, trip, &trip_temp))
698700
return -EINVAL;
@@ -1043,9 +1045,9 @@ static void acpi_thermal_guess_offset(struct acpi_thermal *tz)
10431045
{
10441046
if (tz->trips.critical.flags.valid &&
10451047
(tz->trips.critical.temperature % 5) == 1)
1046-
tz->kelvin_offset = 2731;
1048+
tz->kelvin_offset = 273100;
10471049
else
1048-
tz->kelvin_offset = 2732;
1050+
tz->kelvin_offset = 273200;
10491051
}
10501052

10511053
static void acpi_thermal_check_fn(struct work_struct *work)
@@ -1087,7 +1089,7 @@ static int acpi_thermal_add(struct acpi_device *device)
10871089
INIT_WORK(&tz->thermal_check_work, acpi_thermal_check_fn);
10881090

10891091
pr_info(PREFIX "%s [%s] (%ld C)\n", acpi_device_name(device),
1090-
acpi_device_bid(device), DECI_KELVIN_TO_CELSIUS(tz->temperature));
1092+
acpi_device_bid(device), deci_kelvin_to_celsius(tz->temperature));
10911093
goto end;
10921094

10931095
free_memory:

0 commit comments

Comments
 (0)