Messages in this thread Patch in this message | | | Date | Mon, 5 Jun 2017 10:12:03 -0700 | From | tip-bot for Jan Kiszka <> | Subject | [tip:efi/core] efi/capsule: Adjust return type of efi_capsule_setup_info() |
| |
Commit-ID: 41b0c376951417d1b37448957b30f766b10d3090 Gitweb: http://git.kernel.org/tip/41b0c376951417d1b37448957b30f766b10d3090 Author: Jan Kiszka <jan.kiszka@siemens.com> AuthorDate: Fri, 2 Jun 2017 13:51:59 +0000 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Mon, 5 Jun 2017 17:50:39 +0200
efi/capsule: Adjust return type of efi_capsule_setup_info()
We actually expect int at the caller and never return any size information.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20170602135207.21708-6-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org> --- drivers/firmware/efi/capsule-loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c index 3fb91e1..37d3f6e 100644 --- a/drivers/firmware/efi/capsule-loader.c +++ b/drivers/firmware/efi/capsule-loader.c @@ -53,8 +53,8 @@ static void efi_free_all_buff_pages(struct capsule_info *cap_info) * @kbuff: a mapped first page buffer pointer * @hdr_bytes: the total received number of bytes for efi header **/ -static ssize_t efi_capsule_setup_info(struct capsule_info *cap_info, - void *kbuff, size_t hdr_bytes) +static int efi_capsule_setup_info(struct capsule_info *cap_info, + void *kbuff, size_t hdr_bytes) { efi_capsule_header_t *cap_hdr; size_t pages_needed;
| |