[PATCH] Reduce ACPI resource conflict message to KERN_INFO, printf cleanup

[Andy Whitcroft]

On Tue, Mar 09, 2010 at 09:41:10AM -0500, Chase Douglas wrote:
> By default, ACPI resource conflict messages are logged at level
> KERN_ERR. This is a rather high level for a message that is more a
> warning than an indication of a real kernel error. Also, KERN_ERR level
> messages can appear over some boot splash screens, and this message is
> not serious enough to warrant such treatment. Thus, the log level has
> been reduced to KERN_INFO.
> 
> Also, cleanup message to use %pR resource printing format.
> 
> BugLink: http://bugs.launchpad.net/bugs/440470
> 
> Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
> ---
>  drivers/acpi/osl.c |   14 ++++----------
>  1 files changed, 4 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
> index 7c1c59e..f89f141 100644
> --- a/drivers/acpi/osl.c
> +++ b/drivers/acpi/osl.c
> @@ -1151,16 +1151,10 @@ int acpi_check_resource_conflict(struct resource *res)
>  
>  	if (clash) {
>  		if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {
> -			printk("%sACPI: %s resource %s [0x%llx-0x%llx]"
> -			       " conflicts with ACPI region %s"
> -			       " [0x%llx-0x%llx]\n",
> -			       acpi_enforce_resources == ENFORCE_RESOURCES_LAX
> -			       ? KERN_WARNING : KERN_ERR,
> -			       ioport ? "I/O" : "Memory", res->name,
> -			       (long long) res->start, (long long) res->end,
> -			       res_list_elem->name,
> -			       (long long) res_list_elem->start,
> -			       (long long) res_list_elem->end);
> +			printk(KERN_INFO "ACPI: resource %s %pR"
> +			       " conflicts with ACPI region %s %pR\n",
> +			       res->name, res, res_list_elem->name,
> +			       res_list_elem);
>  			if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)
>  				printk(KERN_NOTICE "ACPI: This conflict may"
>  				       " cause random problems and system"

Sounds like upstream concurs on the level and this simplifies things
generally.

Acked-by: Andy Whitcroft <apw at canonical.com>

-apw