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/efistub.h | |
| parent | efi/libstub: Include dependencies of efistub.h (diff) | |
| download | linux-dev-cb8c90a08c7f2f761919190093fca0611c1cece4.tar.xz linux-dev-cb8c90a08c7f2f761919190093fca0611c1cece4.zip | |
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/efistub.h')
| -rw-r--r-- | drivers/firmware/efi/libstub/efistub.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h index 998924916b03..4f57611a65f2 100644 --- 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_system_table; #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 @@ -605,8 +605,6 @@ efi_status_t efi_exit_boot_services(void *handle, 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, @@ -630,7 +628,9 @@ efi_status_t check_platform_features(void); 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); |