Merge remote-tracking branches 'spi/fix/bcm63xx', 'spi/fix/doc', 'spi/fix/mediatek...

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / thermal.c

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 30d8518b25fbcfdb0ed11121c8725fb229ca17ba..82707f9824cae1a322411d486b486c48864be611 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -315,7 +315,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                        if (crt == -1) {
                                tz->trips.critical.flags.valid = 0;
                        } else if (crt > 0) {
-                               unsigned long crt_k = CELSIUS_TO_KELVIN(crt);
+                               unsigned long crt_k = CELSIUS_TO_DECI_KELVIN(crt);
                                /*
                                 * Allow override critical threshold
                                 */
@@ -351,7 +351,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                if (psv == -1) {
                        status = AE_SUPPORT;
                } else if (psv > 0) {
-                       tmp = CELSIUS_TO_KELVIN(psv);
+                       tmp = CELSIUS_TO_DECI_KELVIN(psv);
                        status = AE_OK;
                } else {
                        status = acpi_evaluate_integer(tz->device->handle,
@@ -431,7 +431,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                                        break;
                                if (i == 1)
                                        tz->trips.active[0].temperature =
-                                               CELSIUS_TO_KELVIN(act);
+                                               CELSIUS_TO_DECI_KELVIN(act);
                                else
                                        /*
                                         * Don't allow override higher than
@@ -439,9 +439,9 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                                         */
                                        tz->trips.active[i - 1].temperature =
                                                (tz->trips.active[i - 2].temperature <
-                                               CELSIUS_TO_KELVIN(act) ?
+                                               CELSIUS_TO_DECI_KELVIN(act) ?
                                                tz->trips.active[i - 2].temperature :
-                                               CELSIUS_TO_KELVIN(act));
+                                               CELSIUS_TO_DECI_KELVIN(act));
                                break;
                        } else {
                                tz->trips.active[i].temperature = tmp;
@@ -1105,7 +1105,7 @@ static int acpi_thermal_add(struct acpi_device *device)
        INIT_WORK(&tz->thermal_check_work, acpi_thermal_check_fn);
 
        pr_info(PREFIX "%s [%s] (%ld C)\n", acpi_device_name(device),
-               acpi_device_bid(device), KELVIN_TO_CELSIUS(tz->temperature));
+               acpi_device_bid(device), DECI_KELVIN_TO_CELSIUS(tz->temperature));
        goto end;
 
 free_memory: