Generate the LED label based off either the DT label node or off the I2C ID in the i2c device id struct. If the label is used then this should denote the LED function. As an example it would be as3645a:<function> Otherwise if the label is not used the LED label will be as3645a:flash and as3645a:indicator. Signed-off-by: Dan Murphy <dmurphy@xxxxxx> --- drivers/leds/leds-as3645a.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/leds/leds-as3645a.c b/drivers/leds/leds-as3645a.c index f883616d9e60..197acd69ddcc 100644 --- a/drivers/leds/leds-as3645a.c +++ b/drivers/leds/leds-as3645a.c @@ -526,10 +526,11 @@ static int as3645a_parse_node(struct as3645a *flash, rval = of_property_read_string(flash->flash_node, "label", &name); if (!rval) - strlcpy(names->flash, name, sizeof(names->flash)); + snprintf(names->flash, sizeof(names->flash), "%s:%s", + id->name, name); else snprintf(names->flash, sizeof(names->flash), - "%s:flash", node->name); + "%s:flash", id->name); rval = of_property_read_u32(flash->flash_node, "flash-timeout-us", &cfg->flash_timeout_us); @@ -570,10 +571,11 @@ static int as3645a_parse_node(struct as3645a *flash, rval = of_property_read_string(flash->indicator_node, "label", &name); if (!rval) - strlcpy(names->indicator, name, sizeof(names->indicator)); + snprintf(names->indicator, sizeof(names->indicator), "%s:%s", + id->name, name); else snprintf(names->indicator, sizeof(names->indicator), - "%s:indicator", node->name); + "%s:indicator", id->name); rval = of_property_read_u32(flash->indicator_node, "led-max-microamp", &cfg->indicator_max_ua); -- 2.15.0.124.g7668cbc60 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
