Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux.git] / drivers / pinctrl / pinctrl-rza1.c

diff --git a/drivers/pinctrl/pinctrl-rza1.c b/drivers/pinctrl/pinctrl-rza1.c
index a0c3d28088ca110f0d19d430d33f6e0b0229fd4e..14eb576c04a2b32216d8fb82775022ed0c82037d 100644 (file)
--- a/drivers/pinctrl/pinctrl-rza1.c
+++ b/drivers/pinctrl/pinctrl-rza1.c
@@ -927,8 +927,8 @@ static int rza1_parse_pinmux_node(struct rza1_pinctrl *rza1_pctl,
                                              &npin_configs);
        if (ret) {
                dev_err(rza1_pctl->dev,
-                       "Unable to parse pin configuration options for %s\n",
-                       np->name);
+                       "Unable to parse pin configuration options for %pOFn\n",
+                       np);
                return ret;
        }
 
@@ -1223,8 +1223,8 @@ static int rza1_parse_gpiochip(struct rza1_pinctrl *rza1_pctl,
 
        *chip           = rza1_gpiochip_template;
        chip->base      = -1;
-       chip->label     = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "%s",
-                                        np->name);
+       chip->label     = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "%pOFn",
+                                        np);
        chip->ngpio     = of_args.args[2];
        chip->of_node   = np;
        chip->parent    = rza1_pctl->dev;
@@ -1284,7 +1284,7 @@ static int rza1_gpio_register(struct rza1_pinctrl *rza1_pctl)
                ret = rza1_parse_gpiochip(rza1_pctl, child, &gpio_chips[i],
                                          &gpio_ranges[i]);
                if (ret)
-                       goto gpiochip_remove;
+                       return ret;
 
                ++i;
        }
@@ -1292,12 +1292,6 @@ static int rza1_gpio_register(struct rza1_pinctrl *rza1_pctl)
        dev_info(rza1_pctl->dev, "Registered %u gpio controllers\n", i);
 
        return 0;
-
-gpiochip_remove:
-       for (; i > 0; i--)
-               devm_gpiochip_remove(rza1_pctl->dev, &gpio_chips[i - 1]);
-
-       return ret;
 }
 
 /**