Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index e3745eb07570..6038966ab045 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -293,10 +293,9 @@ static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p)
         if (pdata) {
                 p->config = *pdata;
         } else if (IS_ENABLED(CONFIG_OF) && np) {
-                ret = of_parse_phandle_with_args(np, "gpio-ranges",
-                                "#gpio-range-cells", 0, &args);
-                p->config.number_of_pins = ret == 0 && args.args_count == 3
-                                         ? args.args[2]
+                ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0,
+                                                       &args);
+                p->config.number_of_pins = ret == 0 ? args.args[2]
                                          : RCAR_MAX_GPIO_PER_BANK;
                 p->config.gpio_base = -1;
         }