summaryrefslogtreecommitdiff
path: root/drivers/firmware/efi/libstub/efi-stub-helper.c
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2020-05-05 10:27:18 +0200
committerArd Biesheuvel <ardb@kernel.org>2020-05-05 10:27:18 +0200
commit0b8d9fc9953fde4ea3eb3191d986ca2d01eb783c (patch)
treeadf26dface72e496c89289ad159de812afa79167 /drivers/firmware/efi/libstub/efi-stub-helper.c
parentf77767ed5f4d398b29119563155e4ece2dfeee13 (diff)
efi/libstub: Make efi_printk() input argument const char*
To help the compiler figure out that efi_printk() will not modify the string it is given, make the input argument type const char*. While at it, simplify the implementation as well. Suggested-by: Joe Perches <joe@perches.com> 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.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c
index 7aac89e928ec..2927f3d30344 100644
--- a/drivers/firmware/efi/libstub/efi-stub-helper.c
+++ b/drivers/firmware/efi/libstub/efi-stub-helper.c
@@ -26,20 +26,15 @@ bool __pure __efi_soft_reserve_enabled(void)
return !efi_nosoftreserve;
}
-void efi_printk(char *str)
+void efi_printk(const char *str)
{
- char *s8;
-
- for (s8 = str; *s8; s8++) {
- efi_char16_t ch[2] = { 0 };
-
- ch[0] = *s8;
- if (*s8 == '\n') {
- efi_char16_t nl[2] = { '\r', 0 };
- efi_char16_printk(nl);
- }
+ while (*str) {
+ efi_char16_t ch[] = { *str++, L'\0' };
- efi_char16_printk(ch);
+ if (ch[0] == L'\n')
+ efi_char16_printk(L"\r\n");
+ else
+ efi_char16_printk(ch);
}
}