[PATCH] reset: Add of_reset_control_get to reset.h

[Philipp Zabel]

Hi Maxime,

Am Mittwoch, den 23.04.2014, 14:27 +0200 schrieb Maxime Ripard:
> On Mon, Apr 14, 2014 at 09:58:06AM +0200, Philipp Zabel wrote:
> > Am Sonntag, den 13.04.2014, 14:09 +0200 schrieb Hans de Goede:
> > > of_reset_control_get is not declared static in drivers/reset/core.c, which
> > > is correct as we want to use it elsewhere too. But it does not have a
> > > protype declared anywhere under include/linux. Add a prototype / stub for it
> > > to linux/reset.h to fix this.
> > > 
> > > Signed-off-by: Hans de Goede <hdegoede at redhat.com>
> > > ---
> > >  include/linux/reset.h | 9 +++++++++
> > >  1 file changed, 9 insertions(+)
> > > 
> > > diff --git a/include/linux/reset.h b/include/linux/reset.h
> > > index c0eda50..f1ae7ce 100644
> > > --- a/include/linux/reset.h
> > > +++ b/include/linux/reset.h
> > > @@ -33,6 +33,9 @@ static inline struct reset_control *devm_reset_control_get_optional(
> > >  	return devm_reset_control_get(dev, id);
> > >  }
> > >  
> > > +struct reset_control *of_reset_control_get(struct device_node *node,
> > > +					   const char *id);
> > > +
> > >  #else
> > >  
> > >  static inline int reset_control_reset(struct reset_control *rstc)
> > > @@ -75,6 +78,12 @@ static inline struct reset_control *devm_reset_control_get_optional(
> > >  	return ERR_PTR(-ENOSYS);
> > >  }
> > >  
> > > +static inline struct reset_control *of_reset_control_get(
> > > +				struct device_node *node, const char *id)
> > > +{
> > > +	return ERR_PTR(-ENOSYS);
> > > +}
> > > +
> > >  #endif /* CONFIG_RESET_CONTROLLER */
> > >  
> > >  #endif
> > 
> > Applied, thanks.
> 
> I just noticed you queued this patch up for 3.16.
> 
> Since that function got introduced in 3.15-rc1, maybe it would be
> better if you queued it for one of 3.15-rc* ?

Good point, this is the first reset framework patch that should actually
be fast-tracked.

regards
Philipp