From patchwork Tue Feb 11 16:23:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Josh Cartwright X-Patchwork-Id: 3628091 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BC0BC9F2F6 for ; Tue, 11 Feb 2014 16:33:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F368A20203 for ; Tue, 11 Feb 2014 16:33:26 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 5C5B9201CD for ; Tue, 11 Feb 2014 16:33:25 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDGFr-0004bU-HN; Tue, 11 Feb 2014 16:32:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDGAv-0000Bj-N8; Tue, 11 Feb 2014 16:27:09 +0000 Received: from smtp.codeaurora.org ([198.145.11.231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDGAZ-00007c-Ax for linux-arm-kernel@lists.infradead.org; Tue, 11 Feb 2014 16:26:49 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id C52D113EFFF; Tue, 11 Feb 2014 16:26:25 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id B878913F2FF; Tue, 11 Feb 2014 16:26:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from joshc.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com [67.52.129.61]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: joshc@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 59FDD13EFFF; Tue, 11 Feb 2014 16:26:25 +0000 (UTC) Received: by joshc.qualcomm.com (Postfix, from userid 1000) id BC190613F0; Tue, 11 Feb 2014 10:24:07 -0600 (CST) From: Josh Cartwright To: Nicolas Pitre , Will Deacon , Lorenzo Pieralisi , Sudeep KarkadaNagesha , linux-kernel@vger.kernel.org Subject: [PATCH 1/8] bus: arm-cci: make use of of_find_matching_node_and_match Date: Tue, 11 Feb 2014 10:23:59 -0600 Message-Id: <1392135847-30791-2-git-send-email-joshc@codeaurora.org> X-Mailer: git-send-email 1.8.5.4 In-Reply-To: <1392135847-30791-1-git-send-email-joshc@codeaurora.org> References: <1392135847-30791-1-git-send-email-joshc@codeaurora.org> MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140211_112647_599880_249761ED X-CRM114-Status: GOOD ( 15.60 ) X-Spam-Score: -2.5 (--) Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of the of_find_matching_node()/of_match_node() pair, which requires two iterations through the match table, make use of of_find_matching_node_and_match(), which only iterates through the table once. This also has the side effect of fixing the following following error hit during randconfig testing: drivers/bus/arm-cci.c: In function ‘cci_probe’: drivers/bus/arm-cci.c:976:49: warning: dereferencing ‘void *’ pointer [enabled by default] cci_config = of_match_node(arm_cci_matches, np)->data; ^ drivers/bus/arm-cci.c:976:49: error: request for member ‘data’ in something not a structure or union Signed-off-by: Josh Cartwright --- drivers/bus/arm-cci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c index 962fd35..e249cdb2 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c @@ -962,6 +962,7 @@ static const struct of_device_id arm_cci_ctrl_if_matches[] = { static int cci_probe(void) { + const struct of_device_id *match; struct cci_nb_ports const *cci_config; int ret, i, nb_ace = 0, nb_ace_lite = 0; struct device_node *np, *cp; @@ -969,11 +970,11 @@ static int cci_probe(void) const char *match_str; bool is_ace; - np = of_find_matching_node(NULL, arm_cci_matches); + np = of_find_matching_node_and_match(NULL, arm_cci_matches, &match); if (!np) return -ENODEV; - cci_config = of_match_node(arm_cci_matches, np)->data; + cci_config = match->data; if (!cci_config) return -ENODEV;