Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi

[platform/kernel/u-boot.git] / drivers / led / led_gpio.c

diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c
index ef9b61e..67ece3c 100644 (file)
--- a/drivers/led/led_gpio.c
+++ b/drivers/led/led_gpio.c
@@ -57,7 +57,7 @@ static enum led_state_t gpio_led_get_state(struct udevice *dev)
 
 static int led_gpio_probe(struct udevice *dev)
 {
-       struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev);
+       struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);
        struct led_gpio_priv *priv = dev_get_priv(dev);
        int ret;
 
@@ -99,17 +99,14 @@ static int led_gpio_bind(struct udevice *parent)
                const char *label;
 
                label = ofnode_read_string(node, "label");
-               if (!label) {
-                       debug("%s: node %s has no label\n", __func__,
-                             ofnode_get_name(node));
-                       return -EINVAL;
-               }
+               if (!label)
+                       label = ofnode_get_name(node);
                ret = device_bind_driver_to_node(parent, "gpio_led",
                                                 ofnode_get_name(node),
                                                 node, &dev);
                if (ret)
                        return ret;
-               uc_plat = dev_get_uclass_platdata(dev);
+               uc_plat = dev_get_uclass_plat(dev);
                uc_plat->label = label;
        }
 
@@ -131,7 +128,7 @@ U_BOOT_DRIVER(led_gpio) = {
        .id     = UCLASS_LED,
        .of_match = led_gpio_ids,
        .ops    = &gpio_led_ops,
-       .priv_auto_alloc_size = sizeof(struct led_gpio_priv),
+       .priv_auto      = sizeof(struct led_gpio_priv),
        .bind   = led_gpio_bind,
        .probe  = led_gpio_probe,
        .remove = led_gpio_remove,