summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Lindholm <leif.lindholm@linaro.org>2015-01-20 16:34:38 +0000
committerMatt Fleming <matt.fleming@intel.com>2015-01-20 22:41:56 +0000
commit11629305043c513454c4ccb4fc384a1bfe610647 (patch)
tree7fb7e453569f1f51dadc34cf910b9bbfb05872e1
parent613782b0875269b6f849e3344a789e647414a434 (diff)
downloadlinux-stable-11629305043c513454c4ccb4fc384a1bfe610647.tar.gz
linux-stable-11629305043c513454c4ccb4fc384a1bfe610647.tar.bz2
linux-stable-11629305043c513454c4ccb4fc384a1bfe610647.zip
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 <leif.lindholm@linaro.org> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--drivers/firmware/efi/efi.c3
1 files changed, 1 insertions, 2 deletions
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++) {