On 11/07/2018 08:37 PM, Daniel Mack wrote: > On 6/11/2018 11:07 PM, Jacek Anaszewski wrote: >> Switch to using generic LED support for composing LED class >> device name. > > Thanks for the rework! > >> Signed-off-by: Jacek Anaszewski <jacek.anaszewski@xxxxxxxxx> >> --- >> 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; > > Not quite following. `fwnode' is the only member of that struct that is > initialized? > >> - 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); > > ... and here, a member that wasn't written before is used? What am I > missing? init_data.name pointer is passed to led_compose_name(), which fills this array with the composed name. -- Best regards, Jacek Anaszewski