Skip to contentSkip to conversation

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

PATCH New Leif Lindholm 2 participants 2 messages Jan 20, 2015 EFI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 efi: don't look for chosen@0 node on DT platforms

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.

---
 drivers/firmware/efi/efi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/firmware/efi/efi.c +1 -2
index 9035c1b..9fd923a 100644
@@ -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 at 0") != 0))
+	if (depth != 1 || strcmp(uname, "chosen") != 0)
 		return 0;
 
 	for (i = 0; i < ARRAY_SIZE(dt_params); i++) {
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 efi: don't look for chosen@0 node on DT platforms

Quoted 10 lines · 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.

---
 drivers/firmware/efi/efi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Thanks Leif. Applied for v3.20.

Signature · 1 line
Matt Fleming, Intel Open Source Technology Center