Re: [PATCH] APEI/ERST: Fix error message formatting

[Joe Perches <joe@perches.com>]

On Mon, 2013-07-29 at 17:22 +0200, Borislav Petkov wrote:
[]
> Right, I'll make it be a hex "0x" in both stall-functions and leave it
> to someone more ACPI-knowledgeable to decide what goes in there - my
> patch is a simple cleanup anyway.
[]
> From: Borislav Petkov <bp@suse.de>
[]
> diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
[]
> @@ -39,7 +39,8 @@
>  
>  #include "apei-internal.h"
>  
> -#define ERST_PFX "ERST: "
> +#undef pr_fmt
> +#define pr_fmt(fmt) "ERST: " fmt

This reverses the order of some ERST/FW_WARN messages.
I don't know if that matters to any log scrapers.


> @@ -109,8 +110,7 @@ static inline int erst_errno(int command_status)
>  static int erst_timedout(u64 *t, u64 spin_unit)
>  {
>  	if ((s64)*t < spin_unit) {
> -		pr_warning(FW_WARN ERST_PFX
> -			   "Firmware does not respond in time\n");
> +		pr_warn(FW_WARN "Firmware does not respond in time\n");

etc...

> @@ -271,8 +271,7 @@ static int erst_exec_move_data(struct apei_exec_context *ctx,
>  
>  	/* ioremap does not work in interrupt context */
>  	if (in_interrupt()) {
> -		pr_warning(ERST_PFX
> -			   "MOVE_DATA can not be used in interrupt context");
> +		pr_warn("MOVE_DATA can not be used in interrupt context");

missing newline