From patchwork Fri May 23 15:19:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 30814 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1B7382066E for ; Fri, 23 May 2014 15:22:04 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id oz11sf18296949veb.6 for ; Fri, 23 May 2014 08:22:03 -0700 (PDT) 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:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=79N628I88lmFBfIZpA7/mV4psAo1L5ts5WbT893W3uc=; b=FolkpXIrpFRdeaZ9LamyYmetxOiiJijSgHD1+p8+oblPnPJsm06NHgNHk3dogM77tQ b9S2ZGfMVZpf8Ca0ACMm+wV9HJVJ5BSnze8i4NXtdojE5Ds61W6xSr8WjGDuNql9zwGs /HC+Q0/Rz2/C0jRGMmAEjl36EVcw9JC4Xe7U+yMcoU0txREJuKvigrQHOEJ4mdpput4E MxpQft6BeG5QlQz0Jaq+8PvdoH02N2EwZ+45+0N+EqTI2jExAkPYtJ3XWoKl6d1X0Q5u 1C5+mgBMyl9PNAjf8VbkcHEHqD4MmEPN3YiSEagZ0XPMjy2zP7CAFzvs3gcEqTbCnmyk ZIfQ== X-Gm-Message-State: ALoCoQlP6iAVH3NcW5IAwdBI9s9mxBlWz8jW8+CzcgUW/mZcpyztteWGd2mF9y8B9enkhAmzfZZx X-Received: by 10.236.128.195 with SMTP id f43mr1989052yhi.45.1400858523808; Fri, 23 May 2014 08:22:03 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.51 with SMTP id 48ls1770779qgu.23.gmail; Fri, 23 May 2014 08:22:03 -0700 (PDT) X-Received: by 10.52.27.170 with SMTP id u10mr921396vdg.69.1400858523585; Fri, 23 May 2014 08:22:03 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id em7si1814005vdb.53.2014.05.23.08.22.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 08:22:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.179 as permitted sender) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id oy12so6442582veb.38 for ; Fri, 23 May 2014 08:22:03 -0700 (PDT) X-Received: by 10.58.186.207 with SMTP id fm15mr4886402vec.4.1400858523514; Fri, 23 May 2014 08:22:03 -0700 (PDT) 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.220.221.72 with SMTP id ib8csp40296vcb; Fri, 23 May 2014 08:22:03 -0700 (PDT) X-Received: by 10.140.23.7 with SMTP id 7mr7637649qgo.0.1400858522358; Fri, 23 May 2014 08:22:02 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id a1si3950046qab.72.2014.05.23.08.22.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 May 2014 08:22:02 -0700 (PDT) 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 1WnrH2-0002t3-6Z; Fri, 23 May 2014 15:20:44 +0000 Received: from mail-wi0-f172.google.com ([209.85.212.172]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WnrGy-0002hI-LM for linux-arm-kernel@lists.infradead.org; Fri, 23 May 2014 15:20:41 +0000 Received: by mail-wi0-f172.google.com with SMTP id hi2so1015329wib.11 for ; Fri, 23 May 2014 08:20:17 -0700 (PDT) X-Received: by 10.180.93.101 with SMTP id ct5mr3901792wib.23.1400858417303; Fri, 23 May 2014 08:20:17 -0700 (PDT) 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 bx2sm4244901wjb.47.2014.05.23.08.20.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 May 2014 08:20:16 -0700 (PDT) From: Leif Lindholm To: linux-efi@vger.kernel.org, matt.fleming@intel.com Subject: [PATCH] efi: arm64: memory node handling cleanup Date: Fri, 23 May 2014 16:19:45 +0100 Message-Id: <1400858385-32079-1-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140523_082040_847198_FAABDBA1 X-CRM114-Status: GOOD ( 10.66 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.172 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Cc: mark.rutland@arm.com, roy.franz@linaro.org, linux-arm-kernel@lists.infradead.org, msalter@redhat.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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+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.128.179 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 Remove unused variable, and convert strncmp() to strcmp(), since the former is not available in arm zImage. Signed-off-by: Leif Lindholm --- drivers/firmware/efi/fdt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/efi/fdt.c b/drivers/firmware/efi/fdt.c index 5c6a8e8..ab12870 100644 --- a/drivers/firmware/efi/fdt.c +++ b/drivers/firmware/efi/fdt.c @@ -63,15 +63,14 @@ static efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, */ prev = 0; for (;;) { - const char *type, *name; - int len; + const char *type; node = fdt_next_node(fdt, prev, NULL); if (node < 0) break; - type = fdt_getprop(fdt, node, "device_type", &len); - if (type && strncmp(type, "memory", len) == 0) { + type = fdt_getprop(fdt, node, "device_type", NULL); + if (type && strcmp(type, "memory") == 0) { fdt_del_node(fdt, node); continue; }