leds: max77650: 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.

Previously if the `label` DT property was not present, the code composed
name for the LED in the form
  "max77650::"
For backwards compatibility we therefore set
  init_data->default_label = ":";
so that the LED will not get a different name if `label` property is not
present.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/leds/leds-max77650.c b/drivers/leds/leds-max77650.c
index a0d4b725c917801c31ba0f1beee5a5a366c944af..acc1174197c354e4076ac16618a07459597bd959 100644 (file)
--- a/drivers/leds/leds-max77650.c
+++ b/drivers/leds/leds-max77650.c
@@ -66,7 +66,6 @@ static int max77650_led_probe(struct platform_device *pdev)
        struct max77650_led *leds, *led;
        struct device *dev;
        struct regmap *map;
-       const char *label;
        int rv, num_leds;
        u32 reg;
 
@@ -86,6 +85,8 @@ static int max77650_led_probe(struct platform_device *pdev)
                return -ENODEV;
 
        device_for_each_child_node(dev, child) {
+               struct led_init_data init_data = {};
+
                rv = fwnode_property_read_u32(child, "reg", &reg);
                if (rv || reg >= MAX77650_LED_NUM_LEDS) {
                        rv = -EINVAL;
@@ -99,22 +100,16 @@ static int max77650_led_probe(struct platform_device *pdev)
                led->cdev.brightness_set_blocking = max77650_led_brightness_set;
                led->cdev.max_brightness = MAX77650_LED_MAX_BRIGHTNESS;
 
-               rv = fwnode_property_read_string(child, "label", &label);
-               if (rv) {
-                       led->cdev.name = "max77650::";
-               } else {
-                       led->cdev.name = devm_kasprintf(dev, GFP_KERNEL,
-                                                       "max77650:%s", label);
-                       if (!led->cdev.name) {
-                               rv = -ENOMEM;
-                               goto err_node_put;
-                       }
-               }
-
                fwnode_property_read_string(child, "linux,default-trigger",
                                            &led->cdev.default_trigger);
 
-               rv = devm_led_classdev_register(dev, &led->cdev);
+               init_data.fwnode = child;
+               init_data.devicename = "max77650";
+               /* for backwards compatibility if `label` is not present */
+               init_data.default_label = ":";
+
+               rv = devm_led_classdev_register_ext(dev, &led->cdev,
+                                                   &init_data);
                if (rv)
                        goto err_node_put;