From patchwork Wed Aug 26 13:24:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 52726 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by patches.linaro.org (Postfix) with ESMTPS id E89A922E9E for ; Wed, 26 Aug 2015 13:25:49 +0000 (UTC) Received: by pabpg12 with SMTP id pg12sf163146127pab.0 for ; Wed, 26 Aug 2015 06:25:49 -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=Y+w/7ZgLTOBIwjFpPkFXSknCI3untR2JTSeg1yAw3qw=; b=b3nttrJaaDxsfSEPDPsTlmaBvuWwUA2KDTrL+JfZQyrgqY4jTFqbYYuawKvw35SFjM 8w+0/ms3gBKbVfgcAfgyWM24fO0vTOyw9Zb+FNEiQ1EVY6i9RwWBT7UdDxGqWBH7JFr7 RJvq9zy2eW2tClPZtvIioVMVjCdhf+MiROSHOoZ7a0hvpLTiasYAJ1B041Qodt5vCPOT Og9vXxGrUJZw61QsKogV392m/5Nu/NP5oCAgYkcxsLNtIml0XeVFh80QSCgpL52P70kW 8rEmjdYZT/XOAzsfWo+Xy5nnoBLhGFQvb6KJ8mIR7SrqQWw1tq5q8n6j5Qe9ANQYaMlN r8mg== X-Gm-Message-State: ALoCoQk0V70IQn7oBe4pNhNU3BfgEeqVq0G+tyorysc62p84fmXfNlIAZc2e2r7iyDibQpES5ZA0 X-Received: by 10.66.231.66 with SMTP id te2mr33435135pac.17.1440595549356; Wed, 26 Aug 2015 06:25:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.182.148.42 with SMTP id tp10ls4500763obb.17.gmail; Wed, 26 Aug 2015 06:25:49 -0700 (PDT) X-Received: by 10.55.195.17 with SMTP id a17mr19742656qkj.84.1440595549194; Wed, 26 Aug 2015 06:25:49 -0700 (PDT) Received: from mail-qk0-f178.google.com (mail-qk0-f178.google.com. [209.85.220.178]) by mx.google.com with ESMTPS id 145si8316734qhq.1.2015.08.26.06.25.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Aug 2015 06:25:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by qkfh127 with SMTP id h127so119386225qkf.1 for ; Wed, 26 Aug 2015 06:25:49 -0700 (PDT) X-Received: by 10.55.53.193 with SMTP id c184mr74981793qka.62.1440595548947; Wed, 26 Aug 2015 06:25:48 -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.55.75.207 with SMTP id y198csp1423731qka; Wed, 26 Aug 2015 06:25:48 -0700 (PDT) X-Received: by 10.68.200.40 with SMTP id jp8mr70721322pbc.16.1440595547808; Wed, 26 Aug 2015 06:25:47 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gn6si38514793pbc.84.2015.08.26.06.25.46; Wed, 26 Aug 2015 06:25:47 -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 S1756681AbbHZNZk (ORCPT + 28 others); Wed, 26 Aug 2015 09:25:40 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:36318 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752988AbbHZNZI (ORCPT ); Wed, 26 Aug 2015 09:25:08 -0400 Received: by wicja10 with SMTP id ja10so44610588wic.1 for ; Wed, 26 Aug 2015 06:25:06 -0700 (PDT) X-Received: by 10.180.8.135 with SMTP id r7mr12948468wia.58.1440595506547; Wed, 26 Aug 2015 06:25:06 -0700 (PDT) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by smtp.gmail.com with ESMTPSA id fs8sm7636540wib.0.2015.08.26.06.25.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Aug 2015 06:25:06 -0700 (PDT) From: Leif Lindholm To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, matt.fleming@intel.com, ard.biesheuvel@linaro.org, msalter@redhat.com Subject: [PATCH 3/3] efi/arm64: clean up efi_get_fdt_params() interface Date: Wed, 26 Aug 2015 14:24:58 +0100 Message-Id: <1440595498-30630-4-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1440595498-30630-1-git-send-email-leif.lindholm@linaro.org> References: <1440595498-30630-1-git-send-email-leif.lindholm@linaro.org> 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: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 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: , 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 --- 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 612ad5e..ab5eeb6 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 78de0bd..aca6aaf 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 85ef051..b1a5b74 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -901,7 +901,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;