diff options
| author | Petr Mladek <pmladek@suse.com> | 2019-10-18 16:40:52 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2019-10-18 16:40:52 +0200 |
| commit | fd612402152fcbc54c482971d97475e38bc1ccd7 (patch) | |
| tree | 1bf9d4d4e2c9c1cb0e68a31b85adba486299c174 /arch/x86/platform | |
| parent | 57f5677e535ba24b8926a7125be2ef8d7f09323c (diff) | |
| parent | c405c37bd9022ece118099fa39040bee8c5adbff (diff) | |
Merge branch 'for-5.5-pr-warn' into for-5.5
Diffstat (limited to 'arch/x86/platform')
| -rw-r--r-- | arch/x86/platform/olpc/olpc-xo15-sci.c | 2 | ||||
| -rw-r--r-- | arch/x86/platform/sfi/sfi.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c index 6d193bb36021..089413cd944e 100644 --- a/arch/x86/platform/olpc/olpc-xo15-sci.c +++ b/arch/x86/platform/olpc/olpc-xo15-sci.c @@ -39,7 +39,7 @@ static int set_lid_wake_behavior(bool wake_on_close) status = acpi_execute_simple_method(NULL, "\\_SB.PCI0.LID.LIDW", wake_on_close); if (ACPI_FAILURE(status)) { - pr_warning(PFX "failed to set lid behavior\n"); + pr_warn(PFX "failed to set lid behavior\n"); return 1; } diff --git a/arch/x86/platform/sfi/sfi.c b/arch/x86/platform/sfi/sfi.c index bf6016f8db4e..6259563760f9 100644 --- a/arch/x86/platform/sfi/sfi.c +++ b/arch/x86/platform/sfi/sfi.c @@ -26,8 +26,7 @@ static unsigned long sfi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; static void __init mp_sfi_register_lapic(u8 id) { if (MAX_LOCAL_APIC - id <= 0) { - pr_warning("Processor #%d invalid (max %d)\n", - id, MAX_LOCAL_APIC); + pr_warn("Processor #%d invalid (max %d)\n", id, MAX_LOCAL_APIC); return; } |