Re: [PATCH] acpi_os_vprintf: Use printk_get_level() to avoid unnecessary KERN_CONT

[Rafael J. Wysocki]

On Wednesday, October 12, 2016 11:50:34 AM Joe Perches wrote:
> acpi_os_vprintf currently always uses a KERN_CONT prefix which may be
> followed immediately by a proper KERN_.  Check if the buffer
> already has a KERN_ at the start of the buffer and avoid the
> unnecessary KERN_CONT.
> 
> Signed-off-by: Joe Perches 
> ---
>  drivers/acpi/osl.c | 13 ++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
> index 4305ee9db4b2..416953a42510 100644
> --- a/drivers/acpi/osl.c
> +++ b/drivers/acpi/osl.c
> @@ -162,11 +162,18 @@ void acpi_os_vprintf(const char *fmt, va_list args)
>   if (acpi_in_debugger) {
>   kdb_printf("%s", buffer);
>   } else {
> - printk(KERN_CONT "%s", buffer);
> + if (printk_get_level(buffer))
> + printk("%s", buffer);
> + else
> + printk(KERN_CONT "%s", buffer);
>   }
>  #else
> - if (acpi_debugger_write_log(buffer) < 0)
> - printk(KERN_CONT "%s", buffer);
> + if (acpi_debugger_write_log(buffer) < 0) {
> + if (printk_get_level(buffer))
> + printk("%s", buffer);
> + else
> + printk(KERN_CONT "%s", buffer);
> + }
>  #endif
>  }

Applied.

Thanks,
Rafael

[PATCH] acpi_os_vprintf: Use printk_get_level() to avoid unnecessary KERN_CONT

[Joe Perches]

acpi_os_vprintf currently always uses a KERN_CONT prefix which may be
followed immediately by a proper KERN_.  Check if the buffer
already has a KERN_ at the start of the buffer and avoid the
unnecessary KERN_CONT.

Signed-off-by: Joe Perches 
---
 drivers/acpi/osl.c | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 4305ee9db4b2..416953a42510 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -162,11 +162,18 @@ void acpi_os_vprintf(const char *fmt, va_list args)
if (acpi_in_debugger) {
kdb_printf("%s", buffer);
} else {
-   printk(KERN_CONT "%s", buffer);
+   if (printk_get_level(buffer))
+   printk("%s", buffer);
+   else
+   printk(KERN_CONT "%s", buffer);
}
 #else
-   if (acpi_debugger_write_log(buffer) < 0)
-   printk(KERN_CONT "%s", buffer);
+   if (acpi_debugger_write_log(buffer) < 0) {
+   if (printk_get_level(buffer))
+   printk("%s", buffer);
+   else
+   printk(KERN_CONT "%s", buffer);
+   }
 #endif
 }
 
-- 
2.10.0.rc2.1.g053435c