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 30d8518b25fb..82707f9824ca 100644 --- 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) | |||
315 | if (crt == -1) { | 315 | if (crt == -1) { |
316 | tz->trips.critical.flags.valid = 0; | 316 | tz->trips.critical.flags.valid = 0; |
317 | } else if (crt > 0) { | 317 | } else if (crt > 0) { |
318 | unsigned long crt_k = CELSIUS_TO_KELVIN(crt); | 318 | unsigned long crt_k = CELSIUS_TO_DECI_KELVIN(crt); |
319 | /* | 319 | /* |
320 | * Allow override critical threshold | 320 | * Allow override critical threshold |
321 | */ | 321 | */ |
@@ -351,7 +351,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag) | |||
351 | if (psv == -1) { | 351 | if (psv == -1) { |
352 | status = AE_SUPPORT; | 352 | status = AE_SUPPORT; |
353 | } else if (psv > 0) { | 353 | } else if (psv > 0) { |
354 | tmp = CELSIUS_TO_KELVIN(psv); | 354 | tmp = CELSIUS_TO_DECI_KELVIN(psv); |
355 | status = AE_OK; | 355 | status = AE_OK; |
356 | } else { | 356 | } else { |
357 | status = acpi_evaluate_integer(tz->device->handle, | 357 | status = acpi_evaluate_integer(tz->device->handle, |
@@ -431,7 +431,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag) | |||
431 | break; | 431 | break; |
432 | if (i == 1) | 432 | if (i == 1) |
433 | tz->trips.active[0].temperature = | 433 | tz->trips.active[0].temperature = |
434 | CELSIUS_TO_KELVIN(act); | 434 | CELSIUS_TO_DECI_KELVIN(act); |
435 | else | 435 | else |
436 | /* | 436 | /* |
437 | * Don't allow override higher than | 437 | * Don't allow override higher than |
@@ -439,9 +439,9 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag) | |||
439 | */ | 439 | */ |
440 | tz->trips.active[i - 1].temperature = | 440 | tz->trips.active[i - 1].temperature = |
441 | (tz->trips.active[i - 2].temperature < | 441 | (tz->trips.active[i - 2].temperature < |
442 | CELSIUS_TO_KELVIN(act) ? | 442 | CELSIUS_TO_DECI_KELVIN(act) ? |
443 | tz->trips.active[i - 2].temperature : | 443 | tz->trips.active[i - 2].temperature : |
444 | CELSIUS_TO_KELVIN(act)); | 444 | CELSIUS_TO_DECI_KELVIN(act)); |
445 | break; | 445 | break; |
446 | } else { | 446 | } else { |
447 | tz->trips.active[i].temperature = tmp; | 447 | tz->trips.active[i].temperature = tmp; |
@@ -1105,7 +1105,7 @@ static int acpi_thermal_add(struct acpi_device *device) | |||
1105 | INIT_WORK(&tz->thermal_check_work, acpi_thermal_check_fn); | 1105 | INIT_WORK(&tz->thermal_check_work, acpi_thermal_check_fn); |
1106 | 1106 | ||
1107 | pr_info(PREFIX "%s [%s] (%ld C)\n", acpi_device_name(device), | 1107 | pr_info(PREFIX "%s [%s] (%ld C)\n", acpi_device_name(device), |
1108 | acpi_device_bid(device), KELVIN_TO_CELSIUS(tz->temperature)); | 1108 | acpi_device_bid(device), DECI_KELVIN_TO_CELSIUS(tz->temperature)); |
1109 | goto end; | 1109 | goto end; |
1110 | 1110 | ||
1111 | free_memory: | 1111 | free_memory: |