Re: [PATCH 09/35] x86: Convert remaining uses of pr_warning to pr_warn
From: Adan Hawthorn
Date: Mon Feb 20 2017 - 20:12:55 EST
On Fri, Feb 17, 2017 at 2:11 AM, Joe Perches <joe@xxxxxxxxxxx> wrote:
> To enable eventual removal of pr_warning
>
> This makes pr_warn use consistent for arch/x86
>
> Prior to this patch, there were 46 uses of pr_warning and
> 122 uses of pr_warn in arch/x86
>
> Miscellanea:
>
> o Coalesce a few formats and realign arguments
> o Convert a couple of multiple line printks to single line
>
> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
...
> diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
> index 4261b3282ad9..37e9129da8b3 100644
> --- a/arch/x86/kernel/apic/apic.c
> +++ b/arch/x86/kernel/apic/apic.c
...
> @@ -1503,11 +1503,11 @@ static int __init setup_nox2apic(char *str)
> int apicid = native_apic_msr_read(APIC_ID);
>
> if (apicid >= 255) {
> - pr_warning("Apicid: %08x, cannot enforce nox2apic\n",
> - apicid);
> + pr_warn("Apicid: %08x, cannot enforce nox2apic\n",
> + apicid);
> return 0;
> }
> - pr_warning("x2apic already enabled.\n");
> + pr_warn("x2apic already enabled\n");
> __x2apic_disable();
> }
> setup_clear_cpu_cap(X86_FEATURE_X2APIC);
...
> diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
> index afc47f5c9531..ad70518cdcc7 100644
> --- a/arch/x86/mm/kmmio.c
> +++ b/arch/x86/mm/kmmio.c
> WARN_ONCE(ret < 0, KERN_ERR pr_fmt("arming at 0x%08lx failed.\n"),
> @@ -335,8 +335,8 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs)
> * something external causing them (f.e. using a debugger while
> * mmio tracing enabled), or erroneous behaviour
> */
> - pr_warning("unexpected debug trap on CPU %d.\n",
> - smp_processor_id());
> + pr_warn("unexpected debug trap on CPU %d\n",
> + smp_processor_id());
> goto out;
> }
>
As just a few examples from the full diff: would not the double line
pr_warn's (above) read better if coalesced each on one line?