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>

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 672924d5ec9dfc9486f55114d23efefe703bd6c3..dcee48fc2e06c4508591477a6760c923e272bfb9 100644 (file)
--- 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",

diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h
index b9909bb0642bbfea587a4f3c2a207b07def7d27f..b31b3be7f8c94abdbd08fee0e39121831ba07633 100644 (file)
--- 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