From patchwork Fri Jun 2 13:51:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 101263 Delivered-To: patch@linaro.org Received: by 10.182.202.35 with SMTP id kf3csp205666obc; Fri, 2 Jun 2017 06:56:56 -0700 (PDT) X-Received: by 10.99.110.200 with SMTP id j191mr7457614pgc.236.1496411816853; Fri, 02 Jun 2017 06:56:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496411816; cv=none; d=google.com; s=arc-20160816; b=Mo175r7+jLwd/B+0giu6jVF9Uy7mJBQvL+kTkJTiXZxJ0nBzhMGD6EwvO0BMpxjhFA MI4oYPVFc3GajTTZUWCny98YTaVKg8Om7A2nHReN71nmj+txD39Fh2W3RN35bPG9WvhE xol5F9NTHIYsrYs3mXJW3xXwf3FmBnRw76pSkKh5Xp999dijnVuU0hqNB5aavYz9JKnq 2AQH1UxXkOK2y8sjG3fKLTAv+DohFZqRtvQ9yo0tIMIPZadqL3bnMJERmnU6RHARikkk uy7Fvw8I3gNJlmMEEF1oAjbFe6qE6XFQQCFjQ4EtqQlIcPxN/48ajKOK7WNN5YMGD/go ckYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=2LfVTPeOrblzGbTjlO4HcIL3boRxuUszk2cnXb9B+dg=; b=taYoN60VUbudkXSIF/uwjU+qUMPn7DCzi5FnCW/vF2ejaGfP6Mi0XfpH8jHYYxzwqj xcI4MpAsutUTYLxDnyVqX4Iog4NaeWbLnnnNmXripPWZIRyb5bz+hHSqJBxaKaoDJ6CA filkMQL4jGCaAXALfxx26rJTNu68eiCvMmbvSAFDdDuYrcGPJQMJquB6QpbJncOEYAf0 bT5AnWLT4hwUul9l8X3iBLxBOsmi/qUhIn87rRD0VeA7u1TGOa/oPkG6tmUK7tRAnS9K NBEBEWAzALWRxFN0OXZwwmsCfhvl4XaubdqTYecnUkN8MTQPcW38dmvgj+1LGT4gOS0S l0Cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q14si22581286pgc.97.2017.06.02.06.56.56; Fri, 02 Jun 2017 06:56:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751735AbdFBN4R (ORCPT + 25 others); Fri, 2 Jun 2017 09:56:17 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:34964 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbdFBNzJ (ORCPT ); Fri, 2 Jun 2017 09:55:09 -0400 Received: by mail-wm0-f49.google.com with SMTP id b84so26394524wmh.0 for ; Fri, 02 Jun 2017 06:55:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2LfVTPeOrblzGbTjlO4HcIL3boRxuUszk2cnXb9B+dg=; b=PhE8kzfrDQcwBORfNXDzNXSMej3pUHB4Znc3KsKGHEjgmrSrQVKGQ3VcY5r2Fog/Lf h5Ot3JWFsu2vf8IhXhhyBizLT8gloItHMUwDwq4jExE0cpiwHYMU14W0lHZR4MI2id4r z6MZJD3dQfi51LYg6PzZmb9okdh9io6LF0vok= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2LfVTPeOrblzGbTjlO4HcIL3boRxuUszk2cnXb9B+dg=; b=qSk8dPpZEGEsshvjy8lP7jhSzeGmMawom5jZDjY/VGYJlc1r7SVM7UZSL/FTrvV87v f1uLSP9LMxuFmK9AWwFnRpF9AIJioUuNP0kAx3ybnyO1GoS1NpUtBvB94rWyjPCB3YDk ZCahJj60U3YhfgBUW9mm875Nxpt2M5huElwnrTMUwFi92tJmLMrEUI/MkqQo7vto1//h tNMz1OkuywMBfN5LTG3T+g3vMNdyIhXe54fP79VZ4iJk7kmPfEAArhFBb1ekU6KrcZRD bK/vxcadXvu7PnIKHLCf1LJK8FFn1wBHEhnm9EMAqmzt+QSw+osY2J+rBTKdGkuVeI2O ZQIg== X-Gm-Message-State: AODbwcCx79TZa2JPsGmF70B4wwCGVPQ7Nc6Ybu1GQEHGzZzMWrfVN6fV hT+b55otkGHL0yd7 X-Received: by 10.80.131.135 with SMTP id 7mr6075779edi.14.1496411692686; Fri, 02 Jun 2017 06:54:52 -0700 (PDT) Received: from localhost.localdomain ([105.151.155.95]) by smtp.gmail.com with ESMTPSA id g48sm9756076edc.8.2017.06.02.06.54.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jun 2017 06:54:51 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Jan Kiszka , Ard Biesheuvel , linux-kernel@vger.kernel.org Subject: [PATCH 05/13] efi/capsule: Adjust return type of efi_capsule_setup_info Date: Fri, 2 Jun 2017 13:51:59 +0000 Message-Id: <20170602135207.21708-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170602135207.21708-1-ard.biesheuvel@linaro.org> References: <20170602135207.21708-1-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Kiszka We actually expect int at the caller and never return any size information. Signed-off-by: Jan Kiszka Reviewed-by: Matt Fleming Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/capsule-loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.3 diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c index 3fb91e1597a9..37d3f6ec2d28 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;