| Message ID | 1421771678-31812-1-git-send-email-leif.lindholm@linaro.org |
|---|---|
| State | Accepted |
| Commit | 11629305043c513454c4ccb4fc384a1bfe610647 |
| Headers | show
Return-Path: <patchwork-forward+bncBDT5PUNIR4DBBLMI7KSQKGQEHFRITOA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E305F2034D for <linaro@patches.linaro.org>; Tue, 20 Jan 2015 16:37:01 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id bs8sf11691322wib.1 for <linaro@patches.linaro.org>; Tue, 20 Jan 2015 08:37:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=1V/Fqww22oVVH/gU2N8sAEhaI3mYP9QainR0zZ+dB7U=; b=TvQieUHbgbKNaCx7J/WxKwSCI7LmjeaxbfauPBRWxKCun2Ji79TWBuyz84X1wXxXl8 t3koKxDr0jcZlA6WV/gjPoukLxTkZ2D71I9Au7oHg/Qh82+/pSYoQbM/kZ3p5HhEcnBe Gzado1CzW64aLlOZR7xjUuiuCKt7GMIv6HPqs/35zXTJBI0DVEIybgqnHyqWjm8AuHdz 2jdpmy462HYq7F9cyDOfJcF8Ec9NLsNXIQFvOY3vWQr6XW0Vy3jmiittX2lCvKhtnPWt b5AVx8I+gzYug8lJPYam8czea/2mfLeSStNcEXRvsTohnL+JoLWDkGDbgEIcRaIrFN0G LmTg== X-Gm-Message-State: ALoCoQkv9mK4twpgAOR9001SdMXZrncsJPa00oq0+hNkM1+68VBgANzQCaJrWc7ls0nOWpM34npC X-Received: by 10.194.241.163 with SMTP id wj3mr176163wjc.5.1421771821210; Tue, 20 Jan 2015 08:37:01 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.116.112 with SMTP id jv16ls341821lab.101.gmail; Tue, 20 Jan 2015 08:37:01 -0800 (PST) X-Received: by 10.112.162.226 with SMTP id yd2mr33062907lbb.1.1421771820988; Tue, 20 Jan 2015 08:37:00 -0800 (PST) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id uf1si17039280lac.89.2015.01.20.08.37.00 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Jan 2015 08:37:00 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id hz20so2081608lab.6 for <patchwork-forward@linaro.org>; Tue, 20 Jan 2015 08:37:00 -0800 (PST) X-Received: by 10.112.125.41 with SMTP id mn9mr39187072lbb.80.1421771820868; Tue, 20 Jan 2015 08:37:00 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp1477741lbb; Tue, 20 Jan 2015 08:36:59 -0800 (PST) X-Received: by 10.66.246.130 with SMTP id xw2mr55576199pac.32.1421771818789; Tue, 20 Jan 2015 08:36:58 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id b6si697416pdk.59.2015.01.20.08.36.57 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jan 2015 08:36:58 -0800 (PST) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 <linux-arm-kernel@lists.infradead.org>; Tue, 20 Jan 2015 08:34:14 -0800 (PST) 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 <leif.lindholm@linaro.org> 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 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.212.180 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.180 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 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: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 |
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++) {
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> --- drivers/firmware/efi/efi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)