From patchwork Thu Nov 27 17:56:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 41640 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9166B244C2 for ; Thu, 27 Nov 2014 17:56:13 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id n15sf3308886lbi.8 for ; Thu, 27 Nov 2014 09:56:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=/7pvjYFOmGa/JGuCAxZaf4RizYuCYFG0V2YW3E/5zeI=; b=YIX/0SkqQeaBQaN8Rl5d56mQ7e+gJa5ltVySZ1L2NSPn7iJewDDf1uSS2itKB+UKwd 9c1KiuRGGMZvwmJAX0TU/FTRrMu8EEpY//vDA31K1H3k8uZv4Y19t8MOm8AHLmkRcYZw r2nXe622VOE2pLkkctIrrc/i4gNtFrhC1KXOE/NPJIRQrtOSW/NFnt5KOXv6FhM1MdyR vI8yL8oV/0NHIYpK0uJLNIOXfg2fTwarIp5dvIFKPsp/o/U9y+8DpJzACLBn5f19jIFV Z2KfjBJhNg+L0aZzV0Fz3CBikQkf01KQdJu0yuqV69ilHHvX4W+Bb2RwvDRdbEoGX9yB Wm2Q== X-Gm-Message-State: ALoCoQm2k2uEsTihDHhGKGUQ0gi1sosbXobsQmAACSKzCM2d90E+h/AeSmpZ8FVxfLCg3oXKxz03 X-Received: by 10.180.24.35 with SMTP id r3mr6433855wif.0.1417110972539; Thu, 27 Nov 2014 09:56:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.205.38 with SMTP id ld6ls868126lac.50.gmail; Thu, 27 Nov 2014 09:56:12 -0800 (PST) X-Received: by 10.112.42.198 with SMTP id q6mr39998441lbl.69.1417110972244; Thu, 27 Nov 2014 09:56:12 -0800 (PST) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id n3si7864886laj.111.2014.11.27.09.56.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Nov 2014 09:56:12 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id f15so4786527lbj.41 for ; Thu, 27 Nov 2014 09:56:12 -0800 (PST) X-Received: by 10.112.235.196 with SMTP id uo4mr39624945lbc.66.1417110972107; Thu, 27 Nov 2014 09:56:12 -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.184.201 with SMTP id ew9csp833061lbc; Thu, 27 Nov 2014 09:56:11 -0800 (PST) X-Received: by 10.70.92.138 with SMTP id cm10mr38004901pdb.133.1417110965602; Thu, 27 Nov 2014 09:56:05 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fl9si12607754pab.154.2014.11.27.09.56.04 for ; Thu, 27 Nov 2014 09:56:05 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751536AbaK0Rzz (ORCPT + 26 others); Thu, 27 Nov 2014 12:55:55 -0500 Received: from mail-wi0-f171.google.com ([209.85.212.171]:56953 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751446AbaK0Rzw (ORCPT ); Thu, 27 Nov 2014 12:55:52 -0500 Received: by mail-wi0-f171.google.com with SMTP id bs8so16482685wib.4 for ; Thu, 27 Nov 2014 09:55:51 -0800 (PST) X-Received: by 10.194.200.129 with SMTP id js1mr62923974wjc.0.1417110951237; Thu, 27 Nov 2014 09:55:51 -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 nj9sm12404437wic.10.2014.11.27.09.55.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Nov 2014 09:55:50 -0800 (PST) From: Leif Lindholm To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: mark.rutland@arm.com, grant.likely@linaro.org, robh+dt@kernel.org, plagnioj@jcrosoft.com, ijc@debian.org, andrew@lunn.ch, s.hauer@pengutronix.de Subject: [PATCH v3 2/3] of: add optional options parameter to of_find_node_by_path() Date: Thu, 27 Nov 2014 17:56:06 +0000 Message-Id: <1417110967-16284-3-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417110967-16284-1-git-send-email-leif.lindholm@linaro.org> References: <1417110967-16284-1-git-send-email-leif.lindholm@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.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.217.182 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Update of_find_node_by_path(): 1) Rename function to of_find_node_opts_by_path(), adding an optional pointer argument. Provide a static inline wrapper version of of_find_node_by_path() which calls the new function with NULL as the optional argument. 2) Ignore any part of the path beyond and including the ':' separator. 3) Set the new provided pointer argument to the beginning of the string following the ':' separator. 4: Add tests. Signed-off-by: Leif Lindholm --- drivers/of/base.c | 21 +++++++++++++++++---- drivers/of/selftest.c | 12 ++++++++++++ include/linux/of.h | 14 +++++++++++++- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 3823edf..7f0e5f7 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -699,10 +699,15 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent, { struct device_node *child; int len = strchrnul(path, '/') - path; + int term; if (!len) return NULL; + term = strchrnul(path, ':') - path; + if (term < len) + len = term; + __for_each_child_of_node(parent, child) { const char *name = strrchr(child->full_name, '/'); if (WARN(!name, "malformed device_node %s\n", child->full_name)) @@ -715,11 +720,14 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent, } /** - * of_find_node_by_path - Find a node matching a full OF path + * of_find_node_opts_by_path - Find a node matching a full OF path * @path: Either the full path to match, or if the path does not * start with '/', the name of a property of the /aliases * node (an alias). In the case of an alias, the node * matching the alias' value will be returned. + * @opts: Address of a pointer into which to store the start of + * an options string appended to the end of the path with + * a ':' separator. * * Valid paths: * /foo/bar Full path @@ -729,19 +737,24 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent, * Returns a node pointer with refcount incremented, use * of_node_put() on it when done. */ -struct device_node *of_find_node_by_path(const char *path) +struct device_node *of_find_node_opts_by_path(const char *path, const char **opts) { struct device_node *np = NULL; struct property *pp; unsigned long flags; + char *separator; if (strcmp(path, "/") == 0) return of_node_get(of_allnodes); + separator = strchr(path, ':'); + if (separator && opts) + *opts = separator + 1; + /* The path could begin with an alias */ if (*path != '/') { char *p = strchrnul(path, '/'); - int len = p - path; + int len = separator ? separator - path : p - path; /* of_aliases must not be NULL */ if (!of_aliases) @@ -770,7 +783,7 @@ struct device_node *of_find_node_by_path(const char *path) raw_spin_unlock_irqrestore(&devtree_lock, flags); return np; } -EXPORT_SYMBOL(of_find_node_by_path); +EXPORT_SYMBOL(of_find_node_opts_by_path); /** * of_find_node_by_name - Find a node by its "name" property diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c index e2d79af..c298065 100644 --- a/drivers/of/selftest.c +++ b/drivers/of/selftest.c @@ -43,6 +43,7 @@ static bool selftest_live_tree; static void __init of_selftest_find_node_by_name(void) { struct device_node *np; + const char *options; np = of_find_node_by_path("/testcase-data"); selftest(np && !strcmp("/testcase-data", np->full_name), @@ -83,6 +84,17 @@ static void __init of_selftest_find_node_by_name(void) np = of_find_node_by_path("testcase-alias/missing-path"); selftest(!np, "non-existent alias with relative path returned node %s\n", np->full_name); of_node_put(np); + + np = of_find_node_opts_by_path("/testcase-data:testoption", &options); + selftest(np && !strcmp("testoption", options), + "option path test failed\n"); + of_node_put(np); + + np = of_find_node_opts_by_path("testcase-alias:testaliasoption", + &options); + selftest(np && !strcmp("testaliasoption", options), + "option alias path test failed\n"); + of_node_put(np); } static void __init of_selftest_dynamic(void) diff --git a/include/linux/of.h b/include/linux/of.h index 29f0adc..a36be70 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -228,7 +228,13 @@ extern struct device_node *of_find_matching_node_and_match( const struct of_device_id *matches, const struct of_device_id **match); -extern struct device_node *of_find_node_by_path(const char *path); +extern struct device_node *of_find_node_opts_by_path(const char *path, + const char **opts); +static inline struct device_node *of_find_node_by_path(const char *path) +{ + return of_find_node_opts_by_path(path, NULL); +} + extern struct device_node *of_find_node_by_phandle(phandle handle); extern struct device_node *of_get_parent(const struct device_node *node); extern struct device_node *of_get_next_parent(struct device_node *node); @@ -385,6 +391,12 @@ static inline struct device_node *of_find_node_by_path(const char *path) return NULL; } +static inline struct device_node *of_find_node_opts_by_path(const char *path, + const char **opts) +{ + return NULL; +} + static inline struct device_node *of_get_parent(const struct device_node *node) { return NULL;