gpio: of: move chip->of_gpio_n_cells checking to of_gpiochip_add()

[cascardo/linux.git] / drivers / gpio / gpiolib-of.c

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index d22dcc3..a68e42d 100644 (file)
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -121,6 +121,7 @@ EXPORT_SYMBOL(of_get_named_gpio_flags);
 /**
  * of_parse_own_gpio() - Get a GPIO hog descriptor, names and flags for GPIO API
  * @np:                device node to get GPIO from
+ * @chip:      GPIO chip whose hog is parsed
  * @name:      GPIO line name
  * @lflags:    gpio_lookup_flags - returned from of_find_gpio() or
  *             of_parse_own_gpio()
@@ -130,19 +131,19 @@ EXPORT_SYMBOL(of_get_named_gpio_flags);
  * value on the error condition.
  */
 static struct gpio_desc *of_parse_own_gpio(struct device_node *np,
+                                          struct gpio_chip *chip,
                                           const char **name,
                                           enum gpio_lookup_flags *lflags,
                                           enum gpiod_flags *dflags)
 {
        struct device_node *chip_np;
        enum of_gpio_flags xlate_flags;
-       struct gg_data gg_data = {
-               .flags = &xlate_flags,
-       };
+       struct of_phandle_args gpiospec;
+       struct gpio_desc *desc;
        u32 tmp;
-       int i, ret;
+       int ret;
 
-       chip_np = np->parent;
+       chip_np = chip->of_node;
        if (!chip_np)
                return ERR_PTR(-EINVAL);
 
@@ -154,25 +155,23 @@ static struct gpio_desc *of_parse_own_gpio(struct device_node *np,
        if (ret)
                return ERR_PTR(ret);
 
-       if (tmp > MAX_PHANDLE_ARGS)
+       if (tmp != chip->of_gpio_n_cells)
                return ERR_PTR(-EINVAL);
 
-       gg_data.gpiospec.args_count = tmp;
-       gg_data.gpiospec.np = chip_np;
-       for (i = 0; i < tmp; i++) {
-               ret = of_property_read_u32_index(np, "gpios", i,
-                                          &gg_data.gpiospec.args[i]);
-               if (ret)
-                       return ERR_PTR(ret);
-       }
+       gpiospec.np = chip_np;
+       gpiospec.args_count = tmp;
 
-       gpiochip_find(&gg_data, of_gpiochip_find_and_xlate);
-       if (!gg_data.out_gpio) {
-               if (np->parent == np)
-                       return ERR_PTR(-ENXIO);
-               else
-                       return ERR_PTR(-EINVAL);
-       }
+       ret = of_property_read_u32_array(np, "gpios", gpiospec.args, tmp);
+       if (ret)
+               return ERR_PTR(ret);
+
+       ret = chip->of_xlate(chip, &gpiospec, &xlate_flags);
+       if (ret < 0)
+               return ERR_PTR(ret);
+
+       desc = gpiochip_get_desc(chip, ret);
+       if (IS_ERR(desc))
+               return desc;
 
        if (xlate_flags & OF_GPIO_ACTIVE_LOW)
                *lflags |= GPIO_ACTIVE_LOW;
@@ -185,14 +184,14 @@ static struct gpio_desc *of_parse_own_gpio(struct device_node *np,
                *dflags |= GPIOD_OUT_HIGH;
        else {
                pr_warn("GPIO line %d (%s): no hogging state specified, bailing out\n",
-                       desc_to_gpio(gg_data.out_gpio), np->name);
+                       desc_to_gpio(desc), np->name);
                return ERR_PTR(-EINVAL);
        }
 
        if (name && of_property_read_string(np, "line-name", name))
                *name = np->name;
 
-       return gg_data.out_gpio;
+       return desc;
 }
 
 /**
@@ -261,7 +260,7 @@ static int of_gpiochip_scan_gpios(struct gpio_chip *chip)
                if (!of_property_read_bool(np, "gpio-hog"))
                        continue;
 
-               desc = of_parse_own_gpio(np, &name, &lflags, &dflags);
+               desc = of_parse_own_gpio(np, chip, &name, &lflags, &dflags);
                if (IS_ERR(desc))
                        continue;
 
@@ -409,6 +408,7 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip)
                        break;
 
                pctldev = of_pinctrl_get(pinspec.np);
+               of_node_put(pinspec.np);
                if (!pctldev)
                        return -EPROBE_DEFER;
 
@@ -486,6 +486,9 @@ int of_gpiochip_add(struct gpio_chip *chip)
                chip->of_xlate = of_gpio_simple_xlate;
        }
 
+       if (chip->of_gpio_n_cells > MAX_PHANDLE_ARGS)
+               return -EINVAL;
+
        status = of_gpiochip_add_pin_range(chip);
        if (status)
                return status;