From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752124AbdFERQm (ORCPT ); Mon, 5 Jun 2017 13:16:42 -0400 Received: from terminus.zytor.com ([65.50.211.136]:54675 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751689AbdFERQk (ORCPT ); Mon, 5 Jun 2017 13:16:40 -0400 Date: Mon, 5 Jun 2017 10:12:03 -0700 From: tip-bot for Jan Kiszka Message-ID: Cc: tglx@linutronix.de, jan.kiszka@siemens.com, torvalds@linux-foundation.org, hpa@zytor.com, matt@codeblueprint.co.uk, linux-kernel@vger.kernel.org, mingo@kernel.org, ard.biesheuvel@linaro.org, peterz@infradead.org Reply-To: matt@codeblueprint.co.uk, hpa@zytor.com, torvalds@linux-foundation.org, jan.kiszka@siemens.com, tglx@linutronix.de, peterz@infradead.org, ard.biesheuvel@linaro.org, mingo@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20170602135207.21708-6-ard.biesheuvel@linaro.org> References: <20170602135207.21708-6-ard.biesheuvel@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi/capsule: Adjust return type of efi_capsule_setup_info() Git-Commit-ID: 41b0c376951417d1b37448957b30f766b10d3090 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 41b0c376951417d1b37448957b30f766b10d3090 Gitweb: http://git.kernel.org/tip/41b0c376951417d1b37448957b30f766b10d3090 Author: Jan Kiszka AuthorDate: Fri, 2 Jun 2017 13:51:59 +0000 Committer: Ingo Molnar 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 Signed-off-by: Ard Biesheuvel Reviewed-by: Matt Fleming Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20170602135207.21708-6-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar --- 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;