[PATCH] efi: don't look for chosen@0 node on DT platforms

[PATCH] efi: don't look for chosen@0 node on DT platforms

[Leif Lindholm]

Due to some scary special case handling noticed in drivers/of, various
bits of the ARM* EFI support patches did duplicate looking for @0
variants of various nodes. Unless on an ancient PPC system, these are
not in fact required. Most instances have become refactored out along
the way, this removes the last one.

Signed-off-by: Leif Lindholm <leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 drivers/firmware/efi/efi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 9035c1b..9fd923a 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -403,8 +403,7 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname,
 	u64 val;
 	int i, len;
 
-	if (depth != 1 ||
-	    (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))
+	if (depth != 1 || strcmp(uname, "chosen") != 0)
 		return 0;
 
 	for (i = 0; i < ARRAY_SIZE(dt_params); i++) {
-- 
2.1.4

Re: [PATCH] efi: don't look for chosen@0 node on DT platforms

[Matt Fleming]

On Tue, 20 Jan, at 04:34:38PM, Leif Lindholm wrote:
> Due to some scary special case handling noticed in drivers/of, various
> bits of the ARM* EFI support patches did duplicate looking for @0
> variants of various nodes. Unless on an ancient PPC system, these are
> not in fact required. Most instances have become refactored out along
> the way, this removes the last one.
> 
> Signed-off-by: Leif Lindholm <leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
>  drivers/firmware/efi/efi.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Thanks Leif. Applied for v3.20.

-- 
Matt Fleming, Intel Open Source Technology Center