xen/ACPI: Drop local acpi_os_{v,}printf() and use plain {v,}printk()

Now that Xen has a real vprintk(), there's no need to opencode it locally with
vsnprintf().  Redirect the debug routines to the real {v,}printk() and drop
the local acpi_os_{v,}printf() implementations.

Amongst other things, this removes one arbitrary limit on message size, as
well as removing a 512 byte static buffer that ought to have been in
__initdata given that is private to an __init function.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c
index ab80d6b2a92a9e3496a1c3c335af9238c75af2a7..7f233bab426918076bf5d61609498baf687cf82f 100644 (file)
--- a/xen/drivers/acpi/osl.c
+++ b/xen/drivers/acpi/osl.c
@@ -45,23 +45,6 @@ ACPI_MODULE_NAME("osl")
 #include CONFIG_ACPI_CUSTOM_DSDT_FILE
 #endif
 
-void __init acpi_os_printf(const char *fmt, ...)
-{
-       va_list args;
-       va_start(args, fmt);
-       acpi_os_vprintf(fmt, args);
-       va_end(args);
-}
-
-void __init acpi_os_vprintf(const char *fmt, va_list args)
-{
-       static char buffer[512];
-
-       vsnprintf(buffer, sizeof(buffer), fmt, args);
-
-       printk("%s", buffer);
-}
-
 acpi_physical_address __initdata rsdp_hint;
 
 acpi_physical_address __init acpi_os_get_root_pointer(void)

diff --git a/xen/include/acpi/acpiosxf.h b/xen/include/acpi/acpiosxf.h
index de83ea38c40fef769f03e14684398421d916ae35..2da318962f0d61bccb93381c30a5ccbdabcbdaac 100644 (file)
--- a/xen/include/acpi/acpiosxf.h
+++ b/xen/include/acpi/acpiosxf.h
@@ -82,8 +82,7 @@ acpi_os_write_memory(acpi_physical_address address, u32 value, u32 width);
 /*
  * Debug print routines
  */
-void ACPI_INTERNAL_VAR_XFACE acpi_os_printf(const char *format, ...);
-
-void acpi_os_vprintf(const char *format, va_list args);
+#define acpi_os_printf printk
+#define acpi_os_vprintf vprintk
 
 #endif                         /* __ACPIOSXF_H__ */