On Tue, Apr 15, 2014 at 11:12:00AM +0100, Lee Jones wrote: > On Tue, 01 Apr 2014, Charles Keepax wrote: > > > It is more idiomatic to process things relating to the regulator in its > > driver. This patch moves both processing of device tree relating to the > > regulator and checking if the regulator is external from arizona-core > > into the regulator driver. > > > > Signed-off-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx> > > --- > > drivers/mfd/arizona-core.c | 12 +++--------- > > drivers/regulator/arizona-ldo1.c | 32 ++++++++++++++++++++++++++++++++ > > 2 files changed, 35 insertions(+), 9 deletions(-) > > [...] > > > diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c > > index b1033d3..211af83 100644 > > --- a/drivers/regulator/arizona-ldo1.c > > +++ b/drivers/regulator/arizona-ldo1.c > > @@ -178,6 +178,22 @@ static const struct regulator_init_data arizona_ldo1_default = { > > .num_consumer_supplies = 1, > > }; > > > > +#ifdef CONFIG_OF > > +static int arizona_ldo1_of_get_pdata(struct arizona *arizona) > > +{ > > + struct arizona_pdata *pdata = &arizona->pdata; > > + > > + arizona_of_get_named_gpio(arizona, "wlf,ldoena", true, &pdata->ldoena); > > + > > + return 0; > > +} > > +#else > > +static inline int arizona_ldo1_of_get_pdata(struct arizona *arizona) > > +{ > > + return 0; > > +} > > +#endif > > + > > I think "if (IS_ENABLED(CONFIG_OF))" is preferred now, but I guess > that's up to Mark. I am happy to respin if this is preferred. Thanks, Charles -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html