diff options
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 44fffe16767e..6e9157a1d92d 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
@@ -384,7 +384,7 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz) | |||
384 | tz->trips.passive.flags.valid = 0; | 384 | tz->trips.passive.flags.valid = 0; |
385 | 385 | ||
386 | if (!tz->trips.passive.flags.valid) | 386 | if (!tz->trips.passive.flags.valid) |
387 | ACPI_WARNING((AE_INFO, "Invalid passive threshold")); | 387 | printk(KERN_WARNING PREFIX "Invalid passive threshold\n"); |
388 | else | 388 | else |
389 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 389 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
390 | "Found passive threshold [%lu]\n", | 390 | "Found passive threshold [%lu]\n", |
@@ -469,7 +469,7 @@ static int acpi_thermal_critical(struct acpi_thermal *tz) | |||
469 | return_VALUE(-EINVAL); | 469 | return_VALUE(-EINVAL); |
470 | 470 | ||
471 | if (tz->temperature >= tz->trips.critical.temperature) { | 471 | if (tz->temperature >= tz->trips.critical.temperature) { |
472 | ACPI_WARNING((AE_INFO, "Critical trip point")); | 472 | printk(KERN_WARNING PREFIX "Critical trip point\n"); |
473 | tz->trips.critical.flags.enabled = 1; | 473 | tz->trips.critical.flags.enabled = 1; |
474 | } else if (tz->trips.critical.flags.enabled) | 474 | } else if (tz->trips.critical.flags.enabled) |
475 | tz->trips.critical.flags.enabled = 0; | 475 | tz->trips.critical.flags.enabled = 0; |
@@ -500,7 +500,7 @@ static int acpi_thermal_hot(struct acpi_thermal *tz) | |||
500 | return_VALUE(-EINVAL); | 500 | return_VALUE(-EINVAL); |
501 | 501 | ||
502 | if (tz->temperature >= tz->trips.hot.temperature) { | 502 | if (tz->temperature >= tz->trips.hot.temperature) { |
503 | ACPI_WARNING((AE_INFO, "Hot trip point")); | 503 | printk(KERN_WARNING PREFIX "Hot trip point\n"); |
504 | tz->trips.hot.flags.enabled = 1; | 504 | tz->trips.hot.flags.enabled = 1; |
505 | } else if (tz->trips.hot.flags.enabled) | 505 | } else if (tz->trips.hot.flags.enabled) |
506 | tz->trips.hot.flags.enabled = 0; | 506 | tz->trips.hot.flags.enabled = 0; |
@@ -640,10 +640,10 @@ static void acpi_thermal_active(struct acpi_thermal *tz) | |||
640 | handles[j], | 640 | handles[j], |
641 | ACPI_STATE_D0); | 641 | ACPI_STATE_D0); |
642 | if (result) { | 642 | if (result) { |
643 | ACPI_WARNING((AE_INFO, | 643 | printk(KERN_WARNING PREFIX |
644 | "Unable to turn cooling device [%p] 'on'", | 644 | "Unable to turn cooling device [%p] 'on'\n", |
645 | active->devices. | 645 | active->devices. |
646 | handles[j])); | 646 | handles[j]); |
647 | continue; | 647 | continue; |
648 | } | 648 | } |
649 | active->flags.enabled = 1; | 649 | active->flags.enabled = 1; |
@@ -665,9 +665,9 @@ static void acpi_thermal_active(struct acpi_thermal *tz) | |||
665 | result = acpi_bus_set_power(active->devices.handles[j], | 665 | result = acpi_bus_set_power(active->devices.handles[j], |
666 | ACPI_STATE_D3); | 666 | ACPI_STATE_D3); |
667 | if (result) { | 667 | if (result) { |
668 | ACPI_WARNING((AE_INFO, | 668 | printk(KERN_WARNING PREFIX |
669 | "Unable to turn cooling device [%p] 'off'", | 669 | "Unable to turn cooling device [%p] 'off'\n", |
670 | active->devices.handles[j])); | 670 | active->devices.handles[j]); |
671 | continue; | 671 | continue; |
672 | } | 672 | } |
673 | active->flags.enabled = 0; | 673 | active->flags.enabled = 0; |