gpio: of: factor out common code to a new helper function
The conversion from a DT spec to struct gpio_desc is common between
of_get_named_gpiod_flags() and of_parse_own_gpio(). Factor out the
common code to a new helper, of_xlate_and_get_gpiod_flags().
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 9f86275..a28feb3 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -36,6 +36,22 @@
return gpiochip_find(np, of_gpiochip_match_node);
}
+static struct gpio_desc *of_xlate_and_get_gpiod_flags(struct gpio_chip *chip,
+ struct of_phandle_args *gpiospec,
+ enum of_gpio_flags *flags)
+{
+ int ret;
+
+ if (chip->of_gpio_n_cells != gpiospec->args_count)
+ return ERR_PTR(-EINVAL);
+
+ ret = chip->of_xlate(chip, gpiospec, flags);
+ if (ret < 0)
+ return ERR_PTR(ret);
+
+ return gpiochip_get_desc(chip, ret);
+}
+
/**
* of_get_named_gpiod_flags() - Get a GPIO descriptor and flags for GPIO API
* @np: device node to get GPIO from
@@ -68,18 +84,8 @@
desc = ERR_PTR(-EPROBE_DEFER);
goto out;
}
- if (chip->of_gpio_n_cells != gpiospec.args_count) {
- desc = ERR_PTR(-EINVAL);
- goto out;
- }
- ret = chip->of_xlate(chip, &gpiospec, flags);
- if (ret < 0) {
- desc = ERR_PTR(ret);
- goto out;
- }
-
- desc = gpiochip_get_desc(chip, ret);
+ desc = of_xlate_and_get_gpiod_flags(chip, &gpiospec, flags);
if (IS_ERR(desc))
goto out;
@@ -144,9 +150,6 @@
if (ret)
return ERR_PTR(ret);
- if (tmp != chip->of_gpio_n_cells)
- return ERR_PTR(-EINVAL);
-
gpiospec.np = chip_np;
gpiospec.args_count = tmp;
@@ -154,11 +157,7 @@
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);
+ desc = of_xlate_and_get_gpiod_flags(chip, &gpiospec, &xlate_flags);
if (IS_ERR(desc))
return desc;