From: Arvind Sankar <nivedita@alum.mit.edu>
Date: Mon, 18 May 2020 15:06:54 -0400
Subject: efi/libstub: Rename efi_[char16_]printk to efi_[char16_]puts
Patch-mainline: v5.8-rc1
Git-commit: cb8c90a08c7f2f761919190093fca0611c1cece4
References: jsc#SLE-16407
These functions do not support formatting, unlike printk. Rename them to
puts to make that clear.
Move the implementations of these two functions next to each other.
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20200518190716.751506-3-nivedita@alum.mit.edu
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Lee, Chun-Yi <jlee@suse.com>
---
drivers/firmware/efi/libstub/efi-stub-helper.c | 18 +++++++++---------
drivers/firmware/efi/libstub/efistub.h | 10 +++++-----
drivers/firmware/efi/libstub/file.c | 4 ++--
3 files changed, 16 insertions(+), 16 deletions(-)
--- a/drivers/firmware/efi/libstub/efi-stub-helper.c
+++ b/drivers/firmware/efi/libstub/efi-stub-helper.c
@@ -26,15 +26,21 @@ bool __pure __efi_soft_reserve_enabled(v
return !efi_nosoftreserve;
}
-void efi_printk(const char *str)
+void efi_char16_puts(efi_char16_t *str)
+{
+ efi_call_proto(efi_table_attr(efi_system_table, con_out),
+ output_string, str);
+}
+
+void efi_puts(const char *str)
{
while (*str) {
efi_char16_t ch[] = { *str++, L'\0' };
if (ch[0] == L'\n')
- efi_char16_printk(L"\r\n");
+ efi_char16_puts(L"\r\n");
else
- efi_char16_printk(ch);
+ efi_char16_puts(ch);
}
}
@@ -279,12 +285,6 @@ void *get_efi_config_table(efi_guid_t gu
return NULL;
}
-void efi_char16_printk(efi_char16_t *str)
-{
- efi_call_proto(efi_table_attr(efi_system_table, con_out),
- output_string, str);
-}
-
/*
* The LINUX_EFI_INITRD_MEDIA_GUID vendor media device path below provides a way
* for the firmware or bootloader to expose the initrd data directly to the stub
--- a/drivers/firmware/efi/libstub/efistub.h
+++ b/drivers/firmware/efi/libstub/efistub.h
@@ -49,10 +49,10 @@ extern const efi_system_table_t *efi_sys
#endif
#define efi_info(msg) do { \
- if (!efi_quiet) efi_printk("EFI stub: "msg); \
+ if (!efi_quiet) efi_puts("EFI stub: "msg); \
} while (0)
-#define efi_err(msg) efi_printk("EFI stub: ERROR: "msg)
+#define efi_err(msg) efi_puts("EFI stub: ERROR: "msg)
/* Helper macros for the usual case of using simple C variables: */
#ifndef fdt_setprop_inplace_var
@@ -618,8 +618,6 @@ efi_status_t efi_exit_boot_services(void
void *priv,
efi_exit_boot_map_processing priv_func);
-void efi_char16_printk(efi_char16_t *);
-
efi_status_t allocate_new_fdt_and_exit_boot(void *handle,
unsigned long *new_fdt_addr,
unsigned long max_addr,
@@ -643,7 +641,9 @@ efi_status_t check_platform_features(voi
void *get_efi_config_table(efi_guid_t guid);
-void efi_printk(const char *str);
+/* NOTE: These functions do not print a trailing newline after the string */
+void efi_char16_puts(efi_char16_t *);
+void efi_puts(const char *str);
void efi_free(unsigned long size, unsigned long addr);
--- a/drivers/firmware/efi/libstub/file.c
+++ b/drivers/firmware/efi/libstub/file.c
@@ -47,8 +47,8 @@ static efi_status_t efi_open_file(efi_fi
status = volume->open(volume, &fh, fi->filename, EFI_FILE_MODE_READ, 0);
if (status != EFI_SUCCESS) {
efi_err("Failed to open file: ");
- efi_char16_printk(fi->filename);
- efi_printk("\n");
+ efi_char16_puts(fi->filename);
+ efi_puts("\n");
return status;
}