From: Leif Lindholm Date: Tue, 20 Jan 2015 16:34:38 +0000 (+0000) Subject: efi: Don't look for chosen@0 node on DT platforms X-Git-Tag: firefly_0821_release~176^2~2395^2^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=11629305043c513454c4ccb4fc384a1bfe610647;p=firefly-linux-kernel-4.4.55.git 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. Signed-off-by: Leif Lindholm Signed-off-by: Matt Fleming --- diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index f8f126812656..23f1eca92dc4 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++) {