Merge branch 'master' of git://git.denx.de/u-boot-spi

[platform/kernel/u-boot.git] / drivers / gpio / dwapb_gpio.c

diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c
index 0f6574d..e55fb4a 100644 (file)
--- a/drivers/gpio/dwapb_gpio.c
+++ b/drivers/gpio/dwapb_gpio.c
@@ -171,8 +171,7 @@ static int gpio_dwapb_bind(struct udevice *dev)
                if (!fdtdec_get_bool(blob, node, "gpio-controller"))
                        continue;
 
-               plat = NULL;
-               plat = calloc(1, sizeof(*plat));
+               plat = devm_kcalloc(dev, 1, sizeof(*plat), GFP_KERNEL);
                if (!plat)
                        return -ENOMEM;
 
@@ -181,23 +180,24 @@ static int gpio_dwapb_bind(struct udevice *dev)
                plat->pins = fdtdec_get_int(blob, node, "snps,nr-gpios", 0);
                plat->name = fdt_stringlist_get(blob, node, "bank-name", 0,
                                                NULL);
-               if (ret)
-                       goto err;
+               if (!plat->name) {
+                       /*
+                        * Fall back to node name. This means accessing pins
+                        * via bank name won't work.
+                        */
+                       plat->name = fdt_get_name(blob, node, NULL);
+               }
 
                ret = device_bind(dev, dev->driver, plat->name,
                                  plat, -1, &subdev);
                if (ret)
-                       goto err;
+                       return ret;
 
                dev_set_of_offset(subdev, node);
                bank++;
        }
 
        return 0;
-
-err:
-       free(plat);
-       return ret;
 }
 
 static int gpio_dwapb_remove(struct udevice *dev)