[PATCH 08/24] leds: lt3593: Use led_compose_name()

[Jacek Anaszewski]

Switch to using generic LED support for composing LED class
device name.

Signed-off-by: Jacek Anaszewski <jacek.anaszew...@gmail.com>
Signed-off-by: Daniel Mack <dan...@zonque.org>
---
 drivers/leds/leds-lt3593.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c
index de3623e..d005abc 100644
--- a/drivers/leds/leds-lt3593.c
+++ b/drivers/leds/leds-lt3593.c
@@ -10,10 +10,10 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <uapi/linux/uleds.h>
+
+#define LED_LT3593_NAME "lt3593"
 
 struct lt3593_led_data {
-       char name[LED_MAX_NAME_SIZE];
        struct led_classdev cdev;
        struct gpio_desc *gpiod;
 };
@@ -111,6 +111,7 @@ static int lt3593_led_probe(struct platform_device *pdev)
        struct fwnode_handle *child;
        int ret, state = LEDS_GPIO_DEFSTATE_OFF;
        enum gpiod_flags flags = GPIOD_OUT_LOW;
+       struct led_init_data init_data;
        const char *tmp;
 
        if (dev_get_platdata(dev)) {
@@ -138,14 +139,11 @@ static int lt3593_led_probe(struct platform_device *pdev)
                return PTR_ERR(led_data->gpiod);
 
        child = device_get_next_child_node(dev, NULL);
+       init_data.fwnode = child;
 
-       ret = fwnode_property_read_string(child, "label", &tmp);
-       if (ret < 0)
-               snprintf(led_data->name, sizeof(led_data->name),
-                        "lt3593::");
-       else
-               snprintf(led_data->name, sizeof(led_data->name),
-                        "lt3593:%s", tmp);
+       ret = led_compose_name(child, LED_LT3593_NAME, ":", init_data.name);
+       if (ret)
+               return ret;
 
        fwnode_property_read_string(child, "linux,default-trigger",
                                    &led_data->cdev.default_trigger);
@@ -160,11 +158,10 @@ static int lt3593_led_probe(struct platform_device *pdev)
                }
        }
 
-       led_data->cdev.name = led_data->name;
        led_data->cdev.brightness_set_blocking = lt3593_led_set;
        led_data->cdev.brightness = state ? LED_FULL : LED_OFF;
 
-       ret = devm_led_classdev_register(dev, &led_data->cdev);
+       ret = devm_led_classdev_register_ext(dev, &led_data->cdev, &init_data);
        if (ret < 0) {
                fwnode_handle_put(child);
                return ret;
-- 
2.1.4