From patchwork Thu Feb 16 17:38:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 94101 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp2613113qgi; Thu, 16 Feb 2017 09:38:30 -0800 (PST) X-Received: by 10.84.128.33 with SMTP id 30mr4838617pla.128.1487266710778; Thu, 16 Feb 2017 09:38:30 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g14si4019857plm.327.2017.02.16.09.38.30; Thu, 16 Feb 2017 09:38:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932254AbdBPRia (ORCPT + 2 others); Thu, 16 Feb 2017 12:38:30 -0500 Received: from mail-wr0-f176.google.com ([209.85.128.176]:34168 "EHLO mail-wr0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932218AbdBPRi3 (ORCPT ); Thu, 16 Feb 2017 12:38:29 -0500 Received: by mail-wr0-f176.google.com with SMTP id z61so16656575wrc.1 for ; Thu, 16 Feb 2017 09:38:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=oODtl/FXDW1NUKpw4U3LGdbFEfRAjyyLr838ydloLUw=; b=FjpH7oZs/pQG12eQ8lqdeoFv66unMAqYefKjpxp7sFe9bELXVVy/FBqLXxfzaY+tPB g4o87eEwbu+v8Eny/b6HxWYNoRazjaTz+/ji3Wrlo+bOnQwBMMz1tXgOuAXiAjwjdl2Y bgSGcC1faKuI90P2Zpl60M1dPtA/8fB0eDbDw= 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; bh=oODtl/FXDW1NUKpw4U3LGdbFEfRAjyyLr838ydloLUw=; b=UTtIUfLaA4UpcE9PkutPKUyiRTQUYhD5RI4A/Hq/00F3+YHbLp2wrW8A/1x3i7lIzx xlHfI1W9dBoKwwsV7aRoWMrbAX6tJ2CxbL7eigUm5tQgoBvHoUS4tpjBNhvtFwK4xw1j 5i5UuOXth6ze7u9BM6ypphrE0ecOvaY+4WD6rb2C8M4/JxfyrGDaeoFgris681jLSM3y gK16psBjBLk4Y01w3JU70jlTJIyBrTt73Nxky3IHvrKS1MzQIALwNBxBrTOE+YhVACDZ ldgQr8oSR4HSFdYDxNu660ZBNYIlLJWT6wbklblG0LKsPJ8L0YiAtrMz0v/k9DBEJ0nM QW/A== X-Gm-Message-State: AMke39lwtVG5CNluBu634eGqWE6vPweSXvcPCbv8E1Brsf7D5t3cf11lkHchX1mu7MTAGaOt X-Received: by 10.223.135.244 with SMTP id c49mr3265348wrc.135.1487266708181; Thu, 16 Feb 2017 09:38:28 -0800 (PST) Received: from localhost.localdomain ([105.149.119.159]) by smtp.gmail.com with ESMTPSA id x135sm1014282wme.23.2017.02.16.09.38.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Feb 2017 09:38:27 -0800 (PST) From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: matt@codeblueprint.co.uk, bhsharma@redhat.com, Ard Biesheuvel Subject: [PATCH] efi: bgrt: add missing 'return 0' to acpi_parse_bgrt() non-ACPI stub Date: Thu, 16 Feb 2017 17:38:17 +0000 Message-Id: <1487266697-1551-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org The prototype of acpi_parse_bgrt() is to return an int, so this applies equally to the stub that is emitted when CONFIG_ACPI is not set. So add the missing return statement there. Signed-off-by: Ard Biesheuvel --- include/linux/efi-bgrt.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/efi-bgrt.h b/include/linux/efi-bgrt.h index 33640cd0e440..e6f624b53c3d 100644 --- a/include/linux/efi-bgrt.h +++ b/include/linux/efi-bgrt.h @@ -15,7 +15,10 @@ extern struct acpi_table_bgrt bgrt_tab; #else /* !CONFIG_ACPI_BGRT */ static inline void efi_bgrt_init(struct acpi_table_header *table) {} -static inline int __init acpi_parse_bgrt(struct acpi_table_header *table) {} +static inline int __init acpi_parse_bgrt(struct acpi_table_header *table) +{ + return 0; +} #endif /* !CONFIG_ACPI_BGRT */