gpiolib: of: make Freescale SPI quirk similar to all others

There is no need for of_find_spi_cs_gpio() to be different from other
quirks: the only variant of property actually used in DTS is "gpios"
(plural) so we can use of_get_named_gpiod_flags() instead of recursing
into of_find_gpio() again.

This will allow us consolidate quirk handling down the road.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index c085649..30b89b6 100644 (file)
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -407,7 +407,7 @@ static struct gpio_desc *of_find_spi_gpio(struct device *dev,
 static struct gpio_desc *of_find_spi_cs_gpio(struct device *dev,
                                             const char *con_id,
                                             unsigned int idx,
-                                            unsigned long *flags)
+                                            enum of_gpio_flags *of_flags)
 {
        const struct device_node *np = dev->of_node;
 
@@ -428,7 +428,7 @@ static struct gpio_desc *of_find_spi_cs_gpio(struct device *dev,
         * uses just "gpios" so translate to that when "cs-gpios" is
         * requested.
         */
-       return of_find_gpio(dev, NULL, idx, flags);
+       return of_get_named_gpiod_flags(dev->of_node, "gpios", idx, of_flags);
 }
 
 /*
@@ -527,12 +527,8 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
                desc = of_find_spi_gpio(dev, con_id, idx, &of_flags);
        }
 
-       if (gpiod_not_found(desc)) {
-               /* This quirk looks up flags and all */
-               desc = of_find_spi_cs_gpio(dev, con_id, idx, flags);
-               if (!IS_ERR(desc))
-                       return desc;
-       }
+       if (gpiod_not_found(desc))
+               desc = of_find_spi_cs_gpio(dev, con_id, idx, &of_flags);
 
        if (gpiod_not_found(desc)) {
                /* Special handling for regulator GPIOs if used */