2020-09-16 23:20:07

by Marek Behún

Subject: [PATCH leds v1 03/10] leds: lm3697: use struct led_init_data when registering

By using struct led_init_data when registering we do not need to parse
`label` DT property nor `linux,default-trigger` property.

Previously if the `label` DT property was not present, the code composed
name for the LED in the form
"parent_name::"
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 <[email protected]>
Cc: Dan Murphy <[email protected]>
---
drivers/leds/leds-lm3697.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/leds/leds-lm3697.c b/drivers/leds/leds-lm3697.c
index 024983088d599..fffeac37b8afa 100644
--- a/drivers/leds/leds-lm3697.c
+++ b/drivers/leds/leds-lm3697.c
@@ -194,7 +194,6 @@ static int lm3697_probe_dt(struct lm3697 *priv)
{
struct fwnode_handle *child = NULL;
struct lm3697_led *led;
- const char *name;
int control_bank;
size_t i = 0;
int ret = -EINVAL;
@@ -214,6 +213,8 @@ static int lm3697_probe_dt(struct lm3697 *priv)
priv->regulator = NULL;

device_for_each_child_node(priv->dev, child) {
+ struct led_init_data init_data = {};
+
ret = fwnode_property_read_u32(child, "reg", &control_bank);
if (ret) {
dev_err(&priv->client->dev, "reg property missing\n");
@@ -268,19 +269,12 @@ static int lm3697_probe_dt(struct lm3697 *priv)
if (ret)
dev_warn(&priv->client->dev, "runtime-ramp properties missing\n");

- fwnode_property_read_string(child, "linux,default-trigger",
- &led->led_dev.default_trigger);
-
- ret = fwnode_property_read_string(child, "label", &name);
- if (ret)
- snprintf(led->label, sizeof(led->label),
- "%s::", priv->client->name);
- else
- snprintf(led->label, sizeof(led->label),
- "%s:%s", priv->client->name, name);
+ init_data.fwnode = child;
+ init_data.devicename = priv->client->name;
+ /* for backwards compatibility if `label` is not present */
+ init_data.default_label = ":";

led->priv = priv;
- led->led_dev.name = led->label;
led->led_dev.max_brightness = led->lmu_data.max_brightness;
led->led_dev.brightness_set_blocking = lm3697_brightness_set;

--
2.26.2

2020-09-17 11:47:08

by Dan Murphy

Subject: Re: [PATCH leds v1 03/10] leds: lm3697: use struct led_init_data when registering

Marek

On 9/16/20 6:16 PM, Marek Behún wrote:
> By using struct led_init_data when registering we do not need to parse
> `label` DT property nor `linux,default-trigger` property.

I would prefer 2 separate patches. One implementing the init_data and
the other removing the default trigger

Dan

2020-09-17 15:27:47

by Marek Behún

Subject: Re: [PATCH leds v1 03/10] leds: lm3697: use struct led_init_data when registering

On Thu, 17 Sep 2020 06:39:56 -0500
Dan Murphy <[email protected]> wrote:

> Marek
>
> On 9/16/20 6:16 PM, Marek Behún wrote:
> > By using struct led_init_data when registering we do not need to parse
> > `label` DT property nor `linux,default-trigger` property.
>
> I would prefer 2 separate patches. One implementing the init_data and
> the other removing the default trigger
>
> Dan
>
>

Am working on it :)