[PATCH 22/24] leds: gpio: 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>
Cc: Linus Walleij <linus.wall...@linaro.org>
---
 drivers/leds/leds-gpio.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index c87fbd3..69a3cde 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -77,11 +77,19 @@ static int gpio_blink_set(struct led_classdev *led_cdev,
 
 static int create_gpio_led(const struct gpio_led *template,
        struct gpio_led_data *led_dat, struct device *parent,
-       struct device_node *np, gpio_blink_set_t blink_set)
+       struct fwnode_handle *fwnode, gpio_blink_set_t blink_set)
 {
+       struct led_init_data init_data = { fwnode };
        int ret, state;
 
-       led_dat->cdev.name = template->name;
+       if (template->name) {
+               led_dat->cdev.name = template->name;
+       } else {
+               ret = led_compose_name(fwnode, NULL, NULL, init_data.name);
+               if (ret)
+                       return ret;
+       }
+
        led_dat->cdev.default_trigger = template->default_trigger;
        led_dat->can_sleep = gpiod_cansleep(led_dat->gpiod);
        if (!led_dat->can_sleep)
@@ -112,7 +120,8 @@ static int create_gpio_led(const struct gpio_led *template,
        if (ret < 0)
                return ret;
 
-       return devm_led_classdev_register(parent, &led_dat->cdev);
+       return devm_led_classdev_register_ext(parent, &led_dat->cdev,
+                                             &init_data);
 }
 
 struct gpio_leds_priv {
@@ -145,15 +154,6 @@ static struct gpio_leds_priv *gpio_leds_create(struct 
platform_device *pdev)
                struct gpio_led_data *led_dat = &priv->leds[priv->num_leds];
                struct gpio_led led = {};
                const char *state = NULL;
-               struct device_node *np = to_of_node(child);
-
-               ret = fwnode_property_read_string(child, "label", &led.name);
-               if (ret && IS_ENABLED(CONFIG_OF) && np)
-                       led.name = np->name;
-               if (!led.name) {
-                       fwnode_handle_put(child);
-                       return ERR_PTR(-EINVAL);
-               }
 
                led.gpiod = devm_fwnode_get_gpiod_from_child(dev, NULL, child,
                                                             GPIOD_ASIS,
@@ -183,12 +183,11 @@ static struct gpio_leds_priv *gpio_leds_create(struct 
platform_device *pdev)
                if (fwnode_property_present(child, "panic-indicator"))
                        led.panic_indicator = 1;
 
-               ret = create_gpio_led(&led, led_dat, dev, np, NULL);
+               ret = create_gpio_led(&led, led_dat, dev, child, NULL);
                if (ret < 0) {
                        fwnode_handle_put(child);
                        return ERR_PTR(ret);
                }
-               led_dat->cdev.dev->of_node = np;
                priv->num_leds++;
        }
 
-- 
2.1.4