From patchwork Mon Oct 12 13:56:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 54762 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id 256FF22DB6 for ; Mon, 12 Oct 2015 13:59:04 +0000 (UTC) Received: by lbcao8 with SMTP id ao8sf69913872lbc.1 for ; Mon, 12 Oct 2015 06:59:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=PFUZB4CiGqRzB+F7nVvHG9vTebplWhBkgOwkgU5o5OY=; b=IQUEJfpcTxhTmfsgPOiQXlLAqIjdv+pC4YKegBsWZwgFUu2vMBNg69UjjjXwSdmaES HqGtEeMJdcMnNjQIWlv8+sehhYKQCqxwWeoQw/yUz83LhgT3LB+d0T7IjegheKFG7sLA 4DorlixIObKBocLZHvmYnltL1Er2zRSb46/U0wvo1oG/p+PVgUiUIEfdUCavsqCUAMI9 //yjuxqxPCRkqmoqV9+Xi81ZgxcSHkEdxwfsGW00abjndIcIoAEZaiopqlXwZDy3+lWY cBO2W1Q2BahUrCxRptIkoqXb4tCv+hFBMOgwwpr2O5U/VS8jDmYvhoKvhkoFL1GvP6vr xIwg== X-Gm-Message-State: ALoCoQlcaQji6GDuBJi2GNXAtfY2qHDvjfZMkSx9nGR6cr7ArgnfEi+pUdgHW1HLYH0UGro342+L X-Received: by 10.112.63.165 with SMTP id h5mr5739964lbs.18.1444658343076; Mon, 12 Oct 2015 06:59:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.18.90 with SMTP id h87ls260055lfi.9.gmail; Mon, 12 Oct 2015 06:59:02 -0700 (PDT) X-Received: by 10.112.155.195 with SMTP id vy3mr12696728lbb.9.1444658342900; Mon, 12 Oct 2015 06:59:02 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id rv1si4538672lbb.14.2015.10.12.06.59.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 06:59:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbbck17 with SMTP id ck17so23641227lbb.1 for ; Mon, 12 Oct 2015 06:59:02 -0700 (PDT) X-Received: by 10.112.139.201 with SMTP id ra9mr12457554lbb.29.1444658342774; Mon, 12 Oct 2015 06:59:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1564867lbq; Mon, 12 Oct 2015 06:59:01 -0700 (PDT) X-Received: by 10.107.134.204 with SMTP id q73mr6758598ioi.162.1444658341827; Mon, 12 Oct 2015 06:59:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p130si765768iop.126.2015.10.12.06.59.01; Mon, 12 Oct 2015 06:59:01 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751765AbbJLN6q (ORCPT + 30 others); Mon, 12 Oct 2015 09:58:46 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:34127 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752077AbbJLN4X (ORCPT ); Mon, 12 Oct 2015 09:56:23 -0400 Received: by wicgb1 with SMTP id gb1so51486364wic.1 for ; Mon, 12 Oct 2015 06:56:23 -0700 (PDT) X-Received: by 10.180.90.229 with SMTP id bz5mr15642428wib.46.1444658182322; Mon, 12 Oct 2015 06:56:22 -0700 (PDT) Received: from localhost ([90.203.240.153]) by smtp.gmail.com with ESMTPSA id gl4sm7284785wjd.49.2015.10.12.06.56.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 06:56:21 -0700 (PDT) From: Matt Fleming To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" Cc: Leif Lindholm , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Mark Salter , Catalin Marinas , Will Deacon , Matt Fleming , Ard Biesheuvel Subject: [PATCH 04/11] efi/arm64: Clean up efi_get_fdt_params() interface Date: Mon, 12 Oct 2015 14:56:07 +0100 Message-Id: <1444658174-23378-5-git-send-email-matt@codeblueprint.co.uk> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1444658174-23378-1-git-send-email-matt@codeblueprint.co.uk> References: <1444658174-23378-1-git-send-email-matt@codeblueprint.co.uk> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: matt@codeblueprint.co.uk X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Leif Lindholm As we now have a common debug infrastructure between core and arm64 efi, drop the bit of the interface passing verbose output flags around. Signed-off-by: Leif Lindholm Acked-by: Ard Biesheuvel Tested-by: Ard Biesheuvel Cc: Mark Salter Cc: Catalin Marinas Cc: Will Deacon Signed-off-by: Matt Fleming --- arch/arm64/kernel/efi.c | 2 +- drivers/firmware/efi/efi.c | 6 ++---- include/linux/efi.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index 612ad5ec1d2e..ab5eeb63e2ca 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -201,7 +201,7 @@ void __init efi_init(void) struct efi_fdt_params params; /* Grab UEFI information placed in FDT by stub */ - if (!efi_get_fdt_params(¶ms, efi_enabled(EFI_DBG))) + if (!efi_get_fdt_params(¶ms)) return; efi_system_table = params.system_table; diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index f0372a022c86..a0a0469e2869 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -492,7 +492,6 @@ static __initdata struct { }; struct param_info { - int verbose; int found; void *params; }; @@ -523,21 +522,20 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname, else *(u64 *)dest = val; - if (info->verbose) + if (efi_enabled(EFI_DBG)) pr_info(" %s: 0x%0*llx\n", dt_params[i].name, dt_params[i].size * 2, val); } return 1; } -int __init efi_get_fdt_params(struct efi_fdt_params *params, int verbose) +int __init efi_get_fdt_params(struct efi_fdt_params *params) { struct param_info info; int ret; pr_info("Getting EFI parameters from FDT:\n"); - info.verbose = verbose; info.found = 0; info.params = params; diff --git a/include/linux/efi.h b/include/linux/efi.h index 26ca9e2fd30e..4677d8a1bfd0 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -902,7 +902,7 @@ extern void efi_initialize_iomem_resources(struct resource *code_resource, struct resource *data_resource, struct resource *bss_resource); extern void efi_get_time(struct timespec *now); extern void efi_reserve_boot_services(void); -extern int efi_get_fdt_params(struct efi_fdt_params *params, int verbose); +extern int efi_get_fdt_params(struct efi_fdt_params *params); extern struct efi_memory_map memmap; extern struct kobject *efi_kobj;