From patchwork Tue Jan 20 16:34:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 5670401 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1020FC058D for ; Tue, 20 Jan 2015 16:38:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50A462034C for ; Tue, 20 Jan 2015 16:38:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6DDAA20303 for ; Tue, 20 Jan 2015 16:38:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YDblL-0001ac-9i; Tue, 20 Jan 2015 16:34:43 +0000 Received: from mail-wi0-f180.google.com ([209.85.212.180]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YDblH-0001Ud-HG for linux-arm-kernel@lists.infradead.org; Tue, 20 Jan 2015 16:34:40 +0000 Received: by mail-wi0-f180.google.com with SMTP id bs8so25307130wib.1 for ; Tue, 20 Jan 2015 08:34:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0AQ0sFvVW3BK9JXkp8O0LtCAL/ujEBk24/XznnbY1rQ=; b=GJoB7Zu7gv/eR3+sK8L0hT+N+92/gSoaMEHVpd3RN9ukbFshwjye245z16Gq+fSzit vrEaWQpg5y30Vo6kE6o2pnKMX5G6TNVkicauNPqrdVT/yu8PvOpY5sIXMDSjA/Vr6pbg xNK62RyBajMwqomR8CAKZdB6cnTNvpVqb6UlVPXOw8AKhDijBnPCvR0RTa/Kqn/Wkrg/ s3g8j01VMFlLjKXj/m4u/j3gGpXxAm1TF0BSwrCOvJ5wpLSrTXOoXfODHiMkDcP02eSV EOJ7lTvAdCYYhHxwsE57uvVlhOjx0PH7mUKCEUYgR+7wiDZP6xboRME1juZjIRmYpLIC xGTQ== X-Gm-Message-State: ALoCoQmyL61JYaF6aB77K4mbauKZen1/l5pASlI6h+qIMz6imdB3KGbaDmL9sB1F//o8h7V8OHGq X-Received: by 10.180.39.35 with SMTP id m3mr25586164wik.3.1421771654242; Tue, 20 Jan 2015 08:34:14 -0800 (PST) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by mx.google.com with ESMTPSA id q10sm18570841wjr.41.2015.01.20.08.34.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jan 2015 08:34:13 -0800 (PST) From: Leif Lindholm To: linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org Subject: [PATCH] efi: don't look for chosen@0 node on DT platforms Date: Tue, 20 Jan 2015 16:34:38 +0000 Message-Id: <1421771678-31812-1-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.1.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150120_083439_732985_4B09BF35 X-CRM114-Status: GOOD ( 11.16 ) X-Spam-Score: -0.7 (/) Cc: matt.fleming@intel.com, msalter@redhat.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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++) {