|
8 | 8 | * Copyright (c) 2003 Open Source Development Lab |
9 | 9 | */ |
10 | 10 |
|
| 11 | +#define pr_fmt(fmt) "ACPI: PM: " fmt |
| 12 | + |
11 | 13 | #include <linux/delay.h> |
12 | 14 | #include <linux/irq.h> |
13 | 15 | #include <linux/dmi.h> |
@@ -41,7 +43,7 @@ static void acpi_sleep_tts_switch(u32 acpi_state) |
41 | 43 | * OS can't evaluate the _TTS object correctly. Some warning |
42 | 44 | * message will be printed. But it won't break anything. |
43 | 45 | */ |
44 | | - printk(KERN_NOTICE "Failure in evaluating _TTS object\n"); |
| 46 | + pr_notice("Failure in evaluating _TTS object\n"); |
45 | 47 | } |
46 | 48 | } |
47 | 49 |
|
@@ -73,8 +75,7 @@ static int acpi_sleep_prepare(u32 acpi_state) |
73 | 75 | } |
74 | 76 | ACPI_FLUSH_CPU_CACHE(); |
75 | 77 | #endif |
76 | | - printk(KERN_INFO PREFIX "Preparing to enter system sleep state S%d\n", |
77 | | - acpi_state); |
| 78 | + pr_info("Preparing to enter system sleep state S%d\n", acpi_state); |
78 | 79 | acpi_enable_wakeup_devices(acpi_state); |
79 | 80 | acpi_enter_sleep_state_prep(acpi_state); |
80 | 81 | return 0; |
@@ -459,8 +460,7 @@ static void acpi_pm_finish(void) |
459 | 460 | if (acpi_state == ACPI_STATE_S0) |
460 | 461 | return; |
461 | 462 |
|
462 | | - printk(KERN_INFO PREFIX "Waking up from system sleep state S%d\n", |
463 | | - acpi_state); |
| 463 | + pr_info("Waking up from system sleep state S%d\n", acpi_state); |
464 | 464 | acpi_disable_wakeup_devices(acpi_state); |
465 | 465 | acpi_leave_sleep_state(acpi_state); |
466 | 466 |
|
@@ -581,7 +581,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state) |
581 | 581 | error = acpi_suspend_lowlevel(); |
582 | 582 | if (error) |
583 | 583 | return error; |
584 | | - pr_info(PREFIX "Low-level resume complete\n"); |
| 584 | + pr_info("Low-level resume complete\n"); |
585 | 585 | pm_set_resume_via_firmware(); |
586 | 586 | break; |
587 | 587 | } |
@@ -921,7 +921,7 @@ static void acpi_hibernation_leave(void) |
921 | 921 | acpi_leave_sleep_state_prep(ACPI_STATE_S4); |
922 | 922 | /* Check the hardware signature */ |
923 | 923 | if (facs && s4_hardware_signature != facs->hardware_signature) |
924 | | - pr_crit("ACPI: Hardware changed while hibernated, success doubtful!\n"); |
| 924 | + pr_crit("Hardware changed while hibernated, success doubtful!\n"); |
925 | 925 | /* Restore the NVS memory area */ |
926 | 926 | suspend_nvs_restore(); |
927 | 927 | /* Allow EC transactions to happen. */ |
@@ -1029,7 +1029,7 @@ static void acpi_power_off_prepare(void) |
1029 | 1029 | static void acpi_power_off(void) |
1030 | 1030 | { |
1031 | 1031 | /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */ |
1032 | | - printk(KERN_DEBUG "%s called\n", __func__); |
| 1032 | + pr_debug("%s called\n", __func__); |
1033 | 1033 | local_irq_disable(); |
1034 | 1034 | acpi_enter_sleep_state(ACPI_STATE_S5); |
1035 | 1035 | } |
@@ -1061,7 +1061,7 @@ int __init acpi_sleep_init(void) |
1061 | 1061 | if (sleep_states[i]) |
1062 | 1062 | pos += sprintf(pos, " S%d", i); |
1063 | 1063 | } |
1064 | | - pr_info(PREFIX "(supports%s)\n", supported); |
| 1064 | + pr_info("(supports%s)\n", supported); |
1065 | 1065 |
|
1066 | 1066 | /* |
1067 | 1067 | * Register the tts_notifier to reboot notifier list so that the _TTS |
|
0 commit comments