leds: bcm6328, bcm6358: use struct led_init_data when registering

By using struct led_init_data when registering we do not need to parse
`label` DT property. Moreover `label` is deprecated and if it is not
present but `color` and `function` are, LED core will compose a name
from these properties instead.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Cc: Álvaro Fernández Rojas <noltari@gmail.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Jaedon Shin <jaedon.shin@gmail.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/leds/leds-bcm6328.c b/drivers/leds/leds-bcm6328.c
index d590a2d00bfd66811fd3551f50487da5e930acdd..d79aeb956c9b631b3530e500ee5633bd45fb158b 100644 (file)
--- a/drivers/leds/leds-bcm6328.c
+++ b/drivers/leds/leds-bcm6328.c
@@ -328,6 +328,7 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
                       void __iomem *mem, spinlock_t *lock,
                       unsigned long *blink_leds, unsigned long *blink_delay)
 {
+       struct led_init_data init_data = {};
        struct bcm6328_led *led;
        const char *state;
        int rc;
@@ -345,7 +346,6 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
        if (of_property_read_bool(nc, "active-low"))
                led->active_low = true;
 
-       led->cdev.name = of_get_property(nc, "label", NULL) ? : nc->name;
        led->cdev.default_trigger = of_get_property(nc,
                                                    "linux,default-trigger",
                                                    NULL);
@@ -382,8 +382,9 @@ static int bcm6328_led(struct device *dev, struct device_node *nc, u32 reg,
 
        led->cdev.brightness_set = bcm6328_led_set;
        led->cdev.blink_set = bcm6328_blink_set;
+       init_data.fwnode = of_fwnode_handle(nc);
 
-       rc = devm_led_classdev_register(dev, &led->cdev);
+       rc = devm_led_classdev_register_ext(dev, &led->cdev, &init_data);
        if (rc < 0)
                return rc;
 

diff --git a/drivers/leds/leds-bcm6358.c b/drivers/leds/leds-bcm6358.c
index eeec4f9c8fb7be818ff5123d131fbf83531ad4b2..0fd495103a4d99dd52f59d1402b573a5a07f3485 100644 (file)
--- a/drivers/leds/leds-bcm6358.c
+++ b/drivers/leds/leds-bcm6358.c
@@ -94,6 +94,7 @@ static void bcm6358_led_set(struct led_classdev *led_cdev,
 static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
                       void __iomem *mem, spinlock_t *lock)
 {
+       struct led_init_data init_data = {};
        struct bcm6358_led *led;
        const char *state;
        int rc;
@@ -109,7 +110,6 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
        if (of_property_read_bool(nc, "active-low"))
                led->active_low = true;
 
-       led->cdev.name = of_get_property(nc, "label", NULL) ? : nc->name;
        led->cdev.default_trigger = of_get_property(nc,
                                                    "linux,default-trigger",
                                                    NULL);
@@ -136,8 +136,9 @@ static int bcm6358_led(struct device *dev, struct device_node *nc, u32 reg,
        bcm6358_led_set(&led->cdev, led->cdev.brightness);
 
        led->cdev.brightness_set = bcm6358_led_set;
+       init_data.fwnode = of_fwnode_handle(nc);
 
-       rc = devm_led_classdev_register(dev, &led->cdev);
+       rc = devm_led_classdev_register_ext(dev, &led->cdev, &init_data);
        if (rc < 0)
                return rc;