diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2016-09-20 16:30:13 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-10-04 15:48:05 +0100 |
| commit | 1961531d1a0a011c77bfaafc8412e84a919d1747 (patch) | |
| tree | 1eddcb450bdeedc8d1991ccca8d6b1eb46bf3220 /drivers/mfd/arizona-core.c | |
| parent | f4c052622567f9ff4f226f0f33d792c5ed01ec7f (diff) | |
| download | linux-1961531d1a0a011c77bfaafc8412e84a919d1747.tar.bz2 | |
mfd: arizona: Remove arizona_of_get_named_gpio helper function
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 <ckeepax@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/mfd/arizona-core.c')
| -rw-r--r-- | drivers/mfd/arizona-core.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 672924d5ec9d..dcee48fc2e06 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; @@ -832,7 +813,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", + pdata->reset); + + pdata->reset = 0; + } ret = of_property_read_u32_array(arizona->dev->of_node, "wlf,gpio-defaults", |