[tip: efi/urgent] efi/libstub: Fix missing-prototypes in string.c
The following commit has been merged into the efi/urgent branch of tip: Commit-ID: aad0f3d693bbb356b9478879ecd245d4f7a2beb0 Gitweb: https://git.kernel.org/tip/aad0f3d693bbb356b9478879ecd245d4f7a2beb0 Author:Tian Tao AuthorDate:Mon, 21 Sep 2020 09:53:23 +08:00 Committer: Ard Biesheuvel CommitterDate: Fri, 25 Sep 2020 23:29:04 +02:00 efi/libstub: Fix missing-prototypes in string.c Fix the following warnings. drivers/firmware/efi/libstub/string.c:83:20: warning: no previous prototype for ‘simple_strtoull’ [-Wmissing-prototypes] drivers/firmware/efi/libstub/string.c:108:6: warning: no previous prototype for ‘simple_strtol’ [-Wmissing-prototypes] Signed-off-by: Tian Tao Link: https://lore.kernel.org/r/1600653203-57909-1-git-send-email-tiant...@hisilicon.com Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/string.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/firmware/efi/libstub/string.c b/drivers/firmware/efi/libstub/string.c index 1ac2f87..5d13e43 100644 --- a/drivers/firmware/efi/libstub/string.c +++ b/drivers/firmware/efi/libstub/string.c @@ -7,6 +7,7 @@ */ #include +#include #include #include
[tip: efi/urgent] efi: Delete deprecated parameter comments
The following commit has been merged into the efi/urgent branch of tip: Commit-ID: f5344e5d6ccb9ddf377202690a135bc64607c621 Gitweb: https://git.kernel.org/tip/f5344e5d6ccb9ddf377202690a135bc64607c621 Author:Tian Tao AuthorDate:Thu, 24 Sep 2020 10:20:18 +08:00 Committer: Ard Biesheuvel CommitterDate: Fri, 25 Sep 2020 23:29:04 +02:00 efi: Delete deprecated parameter comments Delete deprecated parameter comments to fix warnings reported by make W=1. drivers/firmware/efi/vars.c:428: warning: Excess function parameter 'atomic' description in 'efivar_init' Signed-off-by: Tian Tao Link: https://lore.kernel.org/r/1600914018-12697-1-git-send-email-tiant...@hisilicon.com Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/vars.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c index 973eef2..274b0ee 100644 --- a/drivers/firmware/efi/vars.c +++ b/drivers/firmware/efi/vars.c @@ -414,7 +414,6 @@ static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid, * efivar_init - build the initial list of EFI variables * @func: callback function to invoke for every variable * @data: function-specific data to pass to @func - * @atomic: do we need to execute the @func-loop atomically? * @duplicates: error if we encounter duplicates on @head? * @head: initialised head of variable list *
[tip: efi/core] efi/printf: remove unneeded semicolon
The following commit has been merged into the efi/core branch of tip: Commit-ID: 5c4c30f40ca246f83b6663984dcdcbfeb0f8b66f Gitweb: https://git.kernel.org/tip/5c4c30f40ca246f83b6663984dcdcbfeb0f8b66f Author:Tian Tao AuthorDate:Wed, 09 Sep 2020 14:44:32 +08:00 Committer: Ard Biesheuvel CommitterDate: Wed, 16 Sep 2020 18:53:42 +03:00 efi/printf: remove unneeded semicolon Fix the warning below. efi/libstub/vsprintf.c:135:2-3: Unneeded semicolon Signed-off-by: Tian Tao Acked-by: Arvind Sankar Link: https://lore.kernel.org/r/1599633872-36784-1-git-send-email-tiant...@hisilicon.com Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/vsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/libstub/vsprintf.c b/drivers/firmware/efi/libstub/vsprintf.c index e65ef49..1088e28 100644 --- a/drivers/firmware/efi/libstub/vsprintf.c +++ b/drivers/firmware/efi/libstub/vsprintf.c @@ -135,7 +135,7 @@ char *number(char *end, unsigned long long num, int base, char locase) break; default: unreachable(); - }; + } return end; }
