From: leif.lindholm@linaro.org (Leif Lindholm)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] efi/arm64: clean up efi_get_fdt_params() interface
Date: Wed, 26 Aug 2015 14:24:58 +0100 [thread overview]
Message-ID: <1440595498-30630-4-git-send-email-leif.lindholm@linaro.org> (raw)
In-Reply-To: <1440595498-30630-1-git-send-email-leif.lindholm@linaro.org>
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 <leif.lindholm@linaro.org>
---
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;
--
2.1.4
next prev parent reply other threads:[~2015-08-26 13:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-26 13:24 [PATCH 0/3] unify efi debug output across architectures Leif Lindholm
2015-08-26 13:24 ` [PATCH 1/3] efi/x86: move efi=debug option parsing to core Leif Lindholm
2015-08-26 17:25 ` Matt Fleming
2015-08-26 13:24 ` [PATCH 2/3] arm64: use core efi=debug instead of uefi_debug command line parameter Leif Lindholm
2015-08-26 17:24 ` Matt Fleming
2015-08-26 17:30 ` Leif Lindholm
2015-08-26 18:29 ` Ard Biesheuvel
2015-08-28 13:32 ` Matt Fleming
2015-08-26 13:24 ` Leif Lindholm [this message]
2015-08-26 14:04 ` [PATCH 3/3] efi/arm64: clean up efi_get_fdt_params() interface Ard Biesheuvel
2015-08-26 14:15 ` Mark Salter
2015-08-26 14:16 ` Ard Biesheuvel
2015-08-28 13:32 ` Matt Fleming
2015-08-26 13:46 ` [PATCH 0/3] unify efi debug output across architectures Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440595498-30630-4-git-send-email-leif.lindholm@linaro.org \
--to=leif.lindholm@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).