From: Marco Felsch <m.felsch@xxxxxxxxxxxxxx>
Sync local of_phandle_args variable with the kernel to make it easier to
see the diff between both versions. No functional change.
Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx>
Reviewed-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
v1 -> v2:
- fix typo (Jules)
---
drivers/of/of_gpio.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/of/of_gpio.c b/drivers/of/of_gpio.c
index 5da80e249386..c20133bbfd6f 100644
--- a/drivers/of/of_gpio.c
+++ b/drivers/of/of_gpio.c
@@ -60,26 +60,26 @@ static void of_gpio_flags_quirks(struct device_node *np,
int of_get_named_gpio_flags(struct device_node *np, const char *propname,
int index, enum of_gpio_flags *flags)
{
- struct of_phandle_args out_args;
+ struct of_phandle_args gpiospec;
struct device *dev;
int ret;
ret = of_parse_phandle_with_args(np, propname, "#gpio-cells",
- index, &out_args);
+ index, &gpiospec);
if (ret) {
pr_debug("%s: cannot parse %s property: %d\n",
__func__, propname, ret);
return ret;
}
- dev = of_find_device_by_node(out_args.np);
+ dev = of_find_device_by_node(gpiospec.np);
if (!dev) {
pr_debug("%s: unable to find device of node %s\n",
- __func__, out_args.np->full_name);
+ __func__, gpiospec.np->full_name);
return -EPROBE_DEFER;
}
- ret = gpio_get_num(dev, out_args.args[0]);
+ ret = gpio_get_num(dev, gpiospec.args[0]);
if (ret == -EPROBE_DEFER)
return ret;
if (ret < 0) {
@@ -89,7 +89,7 @@ int of_get_named_gpio_flags(struct device_node *np, const char *propname,
}
if (flags) {
- *flags = out_args.args[1];
+ *flags = gpiospec.args[1];
of_gpio_flags_quirks(np, propname, flags, index);
}
--
2.39.2
