[PATCH v2] of: find also nodes by mixture of alias and path

[Sascha Hauer]

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 at 24"
> > > 
> > > Signed-off-by: Jan Weitzel <j.weitzel at phytec.de>
> > > ---
> > > 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 |