On Tue, 20 Sep 2016, Charles Keepax wrote: > This function is only used in a single place and no new users will be > added as all the devices other required GPIOs are already handled. As > such just merge the code back into the calling function. > > Signed-off-by: Charles Keepax <[email protected]> > --- > drivers/mfd/arizona-core.c | 27 +++++++-------------------- > include/linux/mfd/arizona/core.h | 3 --- > 2 files changed, 7 insertions(+), 23 deletions(-) > > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index 4c18c8e..f466f29 100644 > --- a/drivers/mfd/arizona-core.c > +++ b/drivers/mfd/arizona-core.c > @@ -803,25 +803,6 @@ unsigned long arizona_of_get_type(struct device *dev) > } > EXPORT_SYMBOL_GPL(arizona_of_get_type); > > -int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop, > - bool mandatory) > -{ > - int gpio; > - > - gpio = of_get_named_gpio(arizona->dev->of_node, prop, 0); > - if (gpio < 0) { > - if (mandatory) > - dev_err(arizona->dev, > - "Mandatory DT gpio %s missing/malformed: %d\n", > - prop, gpio); > - > - gpio = 0; > - } > - > - return gpio; > -} > -EXPORT_SYMBOL_GPL(arizona_of_get_named_gpio); > - > static int arizona_of_get_core_pdata(struct arizona *arizona) > { > struct arizona_pdata *pdata = &arizona->pdata; > @@ -831,7 +812,13 @@ static int arizona_of_get_core_pdata(struct arizona > *arizona) > int ret, i; > int count = 0; > > - pdata->reset = arizona_of_get_named_gpio(arizona, "wlf,reset", true); > + pdata->reset = of_get_named_gpio(arizona->dev->of_node, "wlf,reset", 0); > + if (pdata->reset < 0) { > + dev_err(arizona->dev, "Reset gpio missing/malformed: %d\n",
gpio should be GPIO. I'll probably just fix this up myself though. Applied, thanks. > + pdata->reset); > + > + pdata->reset = 0; > + } > > ret = of_property_read_u32_array(arizona->dev->of_node, > "wlf,gpio-defaults", > diff --git a/include/linux/mfd/arizona/core.h > b/include/linux/mfd/arizona/core.h > index b9909bb..b31b3be 100644 > --- a/include/linux/mfd/arizona/core.h > +++ b/include/linux/mfd/arizona/core.h > @@ -191,7 +191,4 @@ int cs47l24_patch(struct arizona *arizona); > int wm8997_patch(struct arizona *arizona); > int wm8998_patch(struct arizona *arizona); > > -extern int arizona_of_get_named_gpio(struct arizona *arizona, const char > *prop, > - bool mandatory); > - > #endif -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
