From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W07qw-0006oD-F7 for barebox@lists.infradead.org; Mon, 06 Jan 2014 10:56:30 +0000 Date: Mon, 6 Jan 2014 11:50:52 +0100 From: Sascha Hauer Message-ID: <20140106105052.GE3677@pengutronix.de> References: <1387442377-27773-1-git-send-email-j.weitzel@phytec.de> <1387545888-4380-1-git-send-email-j.weitzel@phytec.de> <20140106093226.GG24559@pengutronix.de> <1389004019.3306.2.camel@lws-weitzel> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1389004019.3306.2.camel@lws-weitzel> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH v2] of: find also nodes by mixture of alias and path To: Jan Weitzel Cc: barebox@lists.infradead.org On Mon, Jan 06, 2014 at 11:26:59AM +0100, Jan Weitzel wrote: > Am Montag, den 06.01.2014, 10:32 +0100 schrieb Sascha Hauer: > > Hi Jan, > > > > On Fri, Dec 20, 2013 at 02:24:48PM +0100, Jan Weitzel wrote: > > > Let of_find_node_by_path_or_alias also find a node starting with an alias > > > followed by a path like "i2c0/tps@24" > > > > > > Signed-off-by: Jan Weitzel > > > --- > > > v2: rename ret to node > > > > > > drivers/of/base.c | 22 +++++++++++++++++++++- > > > 1 files changed, 21 insertions(+), 1 deletions(-) > > > > > > diff --git a/drivers/of/base.c b/drivers/of/base.c > > > index ea2d879..5b5272d 100644 > > > --- a/drivers/of/base.c > > > +++ b/drivers/of/base.c > > > @@ -1378,11 +1378,31 @@ EXPORT_SYMBOL(of_find_node_by_path); > > > struct device_node *of_find_node_by_path_or_alias(struct device_node *root, > > > const char *str) > > > { > > > + struct device_node *node; > > > + char *slash, *alias; > > > + size_t len = 0; > > > + > > > if (*str == '/') > > > return of_find_node_by_path_from(root, str); > > > - else > > > + > > > + slash = _strchr(str, '/'); > > > > You should use regular strchr, not _strchr. Or is there any reason to do > > it differently here? > I got this from the strchr wrapper: > > drivers/of/base.c: In function 'of_find_node_by_path_or_alias': > drivers/of/base.c:1388:8: warning: assignment discards 'const' qualifier > from pointer target type [enabled by default] > > Is there a cleaner way? Try making 'slash' const. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox