mfd: arizona: Factor out read of device tree GPIOs

This patch factors out the reading of GPIOs for the Arizona devices
into a helper function.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

2 files changed, 25 insertions, 9 deletions

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 1c3ae57082ed..37b5e1447d02 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -508,19 +508,32 @@ int 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;
         int ret, i;
 
-        arizona->pdata.reset = of_get_named_gpio(arizona->dev->of_node,
-                                                 "wlf,reset", 0);
-        if (arizona->pdata.reset < 0)
-                arizona->pdata.reset = 0;
-
-        arizona->pdata.ldoena = of_get_named_gpio(arizona->dev->of_node,
-                                                  "wlf,ldoena", 0);
-        if (arizona->pdata.ldoena < 0)
-                arizona->pdata.ldoena = 0;
+        pdata->reset = arizona_of_get_named_gpio(arizona, "wlf,reset", true);
+        pdata->ldoena = arizona_of_get_named_gpio(arizona, "wlf,ldoena", true);
 
         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 5cf8b91ce996..6d9371f88875 100644
--- a/include/linux/mfd/arizona/core.h
+++ b/include/linux/mfd/arizona/core.h
@@ -124,4 +124,7 @@ int wm5102_patch(struct arizona *arizona);
 int wm5110_patch(struct arizona *arizona);
 int wm8997_patch(struct arizona *arizona);
 
+extern int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop,
+                                     bool mandatory);
+
 #endif