From patchwork Thu May 4 18:00:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 98556 Delivered-To: patch@linaro.org Received: by 10.140.89.200 with SMTP id v66csp733344qgd; Thu, 4 May 2017 11:01:43 -0700 (PDT) X-Received: by 10.84.238.9 with SMTP id u9mr58511437plk.126.1493920903115; Thu, 04 May 2017 11:01:43 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q80si2656738pfa.407.2017.05.04.11.01.42; Thu, 04 May 2017 11:01:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753112AbdEDSBl (ORCPT + 7 others); Thu, 4 May 2017 14:01:41 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:34962 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752845AbdEDSBk (ORCPT ); Thu, 4 May 2017 14:01:40 -0400 Received: by mail-it0-f68.google.com with SMTP id 131so2586971itz.2; Thu, 04 May 2017 11:01:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=f65sFVNMmTUha2y/P4f8Yx0/ZPlM1QyIhsKvK1dH1LA=; b=k6DRzMzCg4pfv9rx70GSNkXJgFl/KX0Nu7xqgFIGjAL7/bwFzTwWpU/4i4z25f9jGr BWJljVWCp4jfCSendCfdLjJRB5YhvwkMs+JTuFPSv6rCuKeYMXAw5NtKlqbZv/chKrou zYrFMZklA5cuQxfNmrYOaw/69sSUwiBwZzL4Tdc76P0gaelheK592a3KbfwwoJLis6XJ 7JQ/wwpItTVjng/CprlWFmkotgcY6HZ5pGwoDH1oK0kPaPRXKz3dPO+4Xu6p8KNRzUd9 NqTV9hU/lD7G3IV+wJlTqOPJOkgVMd7w2eN0OMGmdYBMK44a0iMXku8UXxN6vT+BVhiI HLmw== X-Gm-Message-State: AN3rC/7v6L0A0v53gxxmiSB79q6gA2VTtSQwOHj/HvS79MDN2tkxnxe1 C10kxsTMUesjoA== X-Received: by 10.202.50.193 with SMTP id y184mr14010043oiy.45.1493920899952; Thu, 04 May 2017 11:01:39 -0700 (PDT) Received: from localhost.localdomain (66-90-148-125.dyn.grandenetworks.net. [66.90.148.125]) by smtp.googlemail.com with ESMTPSA id d44sm1428684otc.6.2017.05.04.11.01.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 May 2017 11:01:38 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, Frank Rowand , Mark Rutland Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/3] of: fix sparse warnings in of_find_next_cache_node Date: Thu, 4 May 2017 13:00:33 -0500 Message-Id: <20170504180035.12834-1-robh@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org sparse gives a warning that 'handle' is not a __be32: ../drivers/of/base.c:2261:61: warning: incorrect type in argument 1 (different base types) ../drivers/of/base.c:2261:61: expected restricted __be32 const [usertype] *p ../drivers/of/base.c:2261:61: got unsigned int const [usertype] *[assigned] handle We could just change the type, but the code can be improved by using of_parse_phandle instead of open coding it with of_get_property and of_find_node_by_phandle. Signed-off-by: Rob Herring --- drivers/of/base.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-by: Frank Rowand Reviewed-by: Frank Rowand diff --git a/drivers/of/base.c b/drivers/of/base.c index d7c4629a3a2d..016f9d77d64d 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2250,15 +2250,14 @@ EXPORT_SYMBOL_GPL(of_console_check); */ struct device_node *of_find_next_cache_node(const struct device_node *np) { - struct device_node *child; - const phandle *handle; + struct device_node *child, *cache_node; - handle = of_get_property(np, "l2-cache", NULL); - if (!handle) - handle = of_get_property(np, "next-level-cache", NULL); + cache_node = of_parse_phandle(np, "l2-cache", 0); + if (!cache_node) + cache_node = of_parse_phandle(np, "next-level-cache", 0); - if (handle) - return of_find_node_by_phandle(be32_to_cpup(handle)); + if (cache_node) + return cache_node; /* OF on pmac has nodes instead of properties named "l2-cache" * beneath CPU nodes.