2014-06-19 12:22:50

by Kefeng Wang

Subject: [PATCH] efi: fix build warning about of_get_flat_dt_prop

commit 9d0c4dfed(of/fdt: update of_get_flat_dt_prop in prep for libfdt)
change the of_get_flat_dt_prop, so update related variable to fix build
warning. Btw, remove unused variable 'name'.

Signed-off-by: Kefeng Wang <[email protected]>
---
drivers/firmware/efi/efi.c | 5 ++---
drivers/firmware/efi/fdt.c | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index cd36deb..e6da090 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -353,10 +353,9 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname,
int depth, void *data)
{
struct param_info *info = data;
- void *prop, *dest;
- unsigned long len;
+ const void *prop, *dest;
+ int len, i;
u64 val;
- int i;

if (depth != 1 ||
(strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))
diff --git a/drivers/firmware/efi/fdt.c b/drivers/firmware/efi/fdt.c
index 5c6a8e8..82d7741 100644
--- a/drivers/firmware/efi/fdt.c
+++ b/drivers/firmware/efi/fdt.c
@@ -63,7 +63,7 @@ static efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt,
*/
prev = 0;
for (;;) {
- const char *type, *name;
+ const char *type;
int len;

node = fdt_next_node(fdt, prev, NULL);
--
1.7.1

2014-06-19 14:07:04

by Matt Fleming

Subject: Re: [PATCH] efi: fix build warning about of_get_flat_dt_prop

On Thu, 19 Jun, at 08:22:32PM, Kefeng Wang wrote:
> commit 9d0c4dfed(of/fdt: update of_get_flat_dt_prop in prep for libfdt)
> change the of_get_flat_dt_prop, so update related variable to fix build
> warning. Btw, remove unused variable 'name'.
>
> Signed-off-by: Kefeng Wang <[email protected]>
> ---
> drivers/firmware/efi/efi.c | 5 ++---
> drivers/firmware/efi/fdt.c | 2 +-
> 2 files changed, 3 insertions(+), 4 deletions(-)

Thanks for this, but I've already queued up a fix from Catalin that
addresses these issues,

http://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/commit/?h=urgent

I've been pretty slack in getting this fix sent upstream, but I'll do
that asap.

--
Matt Fleming, Intel Open Source Technology Center