efi: Don't look for chosen@0 node on DT platforms
authorLeif Lindholm <leif.lindholm@linaro.org>
Tue, 20 Jan 2015 16:34:38 +0000 (16:34 +0000)
committerMatt Fleming <matt.fleming@intel.com>
Tue, 20 Jan 2015 22:41:56 +0000 (22:41 +0000)
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>
drivers/firmware/efi/efi.c

index f8f126812656705a4ed21409613f20fdf80c19b6..23f1eca92dc4b16b4f9b07012e14d8d22b306561 100644 (file)
@@ -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++) {