diff options
| author | Arvind Sankar <nivedita@alum.mit.edu> | 2020-05-18 15:06:54 -0400 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2020-05-19 09:23:22 +0200 |
| commit | cb8c90a08c7f2f761919190093fca0611c1cece4 (patch) | |
| tree | 7f800d6b319ca66e90650672340ff74d15f5e6de /drivers/firmware/efi/libstub/efi-stub-helper.c | |
| parent | 0b76735380224497e1c78a1bed606cbda83e3427 (diff) | |
efi/libstub: Rename efi_[char16_]printk to efi_[char16_]puts
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>
Diffstat (limited to 'drivers/firmware/efi/libstub/efi-stub-helper.c')
| -rw-r--r-- | drivers/firmware/efi/libstub/efi-stub-helper.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c index 2927f3d30344..c6d7ef35e9f7 100644 --- 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(void) 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 guid) 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 |