From: Jacek Anaszewski <jacek.anaszewski@gmail.com>
To: Dan Murphy <dmurphy@ti.com>, linux-leds@vger.kernel.org
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
pavel@ucw.cz, robh@kernel.org
Subject: Re: [PATCH 12/24] leds: lm3692x: Use led_compose_name()
Date: Thu, 8 Nov 2018 21:48:12 +0100 [thread overview]
Message-ID: <a58cdce3-3d15-0ab4-de98-01e526a142a1@gmail.com> (raw)
In-Reply-To: <d1267477-e000-f392-290f-2546f8ee379c@ti.com>
Dan,
On 11/08/2018 07:14 PM, Dan Murphy wrote:
> On 11/06/2018 04:07 PM, Jacek Anaszewski wrote:
>> Switch to using generic LED support for composing LED class
>> device name.
>>
>> Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
>> Cc: Dan Murphy <dmurphy@ti.com>
>> ---
>> drivers/leds/leds-lm3692x.c | 39 ++++++++++++++++++++-------------------
>> 1 file changed, 20 insertions(+), 19 deletions(-)
>>
>> diff --git a/drivers/leds/leds-lm3692x.c b/drivers/leds/leds-lm3692x.c
>> index 4f413a7..9dfc0f2 100644
>> --- a/drivers/leds/leds-lm3692x.c
>> +++ b/drivers/leds/leds-lm3692x.c
>> @@ -13,7 +13,6 @@
>> #include <linux/regmap.h>
>> #include <linux/regulator/consumer.h>
>> #include <linux/slab.h>
>> -#include <uapi/linux/uleds.h>
>>
>> #define LM36922_MODEL 0
>> #define LM36923_MODEL 1
>> @@ -95,6 +94,9 @@
>> #define LM3692X_FAULT_FLAG_SHRT BIT(3)
>> #define LM3692X_FAULT_FLAG_OPEN BIT(4)
>>
>> +#define LM36922_NAME "lm36922"
>> +#define LM36923_NAME "lm36923"
>> +
>> /**
>> * struct lm3692x_led -
>> * @lock - Lock for reading/writing the device
>> @@ -103,7 +105,6 @@
>> * @regmap - Devices register map
>> * @enable_gpio - VDDIO/EN gpio to enable communication interface
>> * @regulator - LED supply regulator pointer
>> - * @label - LED label
>> * @led_enable - LED sync to be enabled
>> * @model_id - Current device model ID enumerated
>> */
>> @@ -114,7 +115,6 @@ struct lm3692x_led {
>> struct regmap *regmap;
>> struct gpio_desc *enable_gpio;
>> struct regulator *regulator;
>> - char label[LED_MAX_NAME_SIZE];
>> int led_enable;
>> int model_id;
>> };
>> @@ -325,7 +325,8 @@ static int lm3692x_init(struct lm3692x_led *led)
>> static int lm3692x_probe_dt(struct lm3692x_led *led)
>> {
>> struct fwnode_handle *child = NULL;
>> - const char *name;
>> + struct led_init_data init_data;
>> + char *model_name;
>> int ret;
>>
>> led->enable_gpio = devm_gpiod_get_optional(&led->client->dev,
>> @@ -346,17 +347,20 @@ static int lm3692x_probe_dt(struct lm3692x_led *led)
>> dev_err(&led->client->dev, "No LED Child node\n");
>> return -ENODEV;
>> }
>> + init_data.fwnode = child;
>>
>> - fwnode_property_read_string(child, "linux,default-trigger",
>> - &led->led_dev.default_trigger);
>> + if (led->model_id == LM36922_MODEL)
>> + model_name = LM36922_NAME;
>> + else
>> + model_name = LM36923_NAME;
>>
>> - ret = fwnode_property_read_string(child, "label", &name);
>> + ret = led_compose_name(child, model_name, ":backlight_cluster",
>> + init_data.name);
>> if (ret)
>> - snprintf(led->label, sizeof(led->label),
>> - "%s::", led->client->name);
>> - else
>> - snprintf(led->label, sizeof(led->label),
>> - "%s:%s", led->client->name, name);
>> + return ret;
>> +
>> + fwnode_property_read_string(child, "linux,default-trigger",
>> + &led->led_dev.default_trigger);
>>
>> ret = fwnode_property_read_u32(child, "reg", &led->led_enable);
>> if (ret) {
>> @@ -364,16 +368,13 @@ static int lm3692x_probe_dt(struct lm3692x_led *led)
>> return ret;
>> }
>>
>> - led->led_dev.name = led->label;
>> -
>> - ret = devm_led_classdev_register(&led->client->dev, &led->led_dev);
>> + ret = devm_led_classdev_register_ext(&led->client->dev, &led->led_dev,
>> + &init_data);
>> if (ret) {
>> dev_err(&led->client->dev, "led register err: %d\n", ret);
>> return ret;
>> }
>>
>> - led->led_dev.dev->of_node = to_of_node(child);
>> -
>> return 0;
>> }
>>
>> @@ -439,8 +440,8 @@ static int lm3692x_remove(struct i2c_client *client)
>> }
>>
>> static const struct i2c_device_id lm3692x_id[] = {
>> - { "lm36922", LM36922_MODEL },
>> - { "lm36923", LM36923_MODEL },
>> + { LM36922_NAME, LM36922_MODEL },
>> + { LM36923_NAME, LM36923_MODEL },
>
> How is this change relevant?
> No mention in the comments about this change.
Unrelated. It is a remnant from the stage of development, where I had
an impression that i2c_client name is taken from this array
somehow. Only later I learned that it is taken from OF compatible
property after removing vendor prefix with comma.
Afterwards I decide to abide by this change since it seems to be
just an improvement - if I'm adding the string definition anyway,
then why not replace other matching literals?
I will add the explanation if the commit message if there are no
other objections.
>> { }
>> };
>> MODULE_DEVICE_TABLE(i2c, lm3692x_id);
>>
>
>
--
Best regards,
Jacek Anaszewski
next prev parent reply other threads:[~2018-11-08 20:48 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 22:07 [PATCH 00/24] Add generic support for composing LED class device name Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 01/24] leds: class: Improve LED and LED flash class registration API Jacek Anaszewski
2018-11-07 6:55 ` Baolin Wang
2018-11-07 20:51 ` Jacek Anaszewski
2018-11-08 17:50 ` Dan Murphy
2018-11-08 20:47 ` Jacek Anaszewski
2018-11-11 11:31 ` Pavel Machek
2018-11-06 22:07 ` [PATCH 02/24] leds: core: Add support for composing LED class device names Jacek Anaszewski
2018-11-07 7:20 ` Baolin Wang
2018-11-08 20:47 ` Jacek Anaszewski
2018-11-09 2:35 ` Baolin Wang
2018-11-08 18:06 ` Dan Murphy
2018-11-08 20:48 ` Jacek Anaszewski
2018-11-11 12:02 ` Pavel Machek
2018-11-11 20:02 ` Jacek Anaszewski
2018-11-11 20:16 ` Pavel Machek
2018-11-11 21:14 ` Jacek Anaszewski
2018-11-12 0:01 ` Vesa Jääskeläinen
2018-11-12 15:59 ` Jacek Anaszewski
2018-11-12 21:25 ` Linus Walleij
2018-11-12 22:11 ` LEDs on USB keyboards was " Pavel Machek
2018-11-12 10:35 ` Pavel Machek
2018-11-12 16:01 ` Jacek Anaszewski
2018-11-12 19:05 ` Pavel Machek
2018-11-12 20:11 ` Jacek Anaszewski
2018-11-12 22:06 ` Pavel Machek
2018-11-13 20:57 ` Jacek Anaszewski
2018-11-13 21:38 ` Geert Uytterhoeven
2018-11-13 21:50 ` Pavel Machek
2018-11-12 21:23 ` Linus Walleij
2018-11-13 19:55 ` Jacek Anaszewski
2018-11-15 9:10 ` Linus Walleij
2018-11-06 22:07 ` [PATCH 03/24] leds: dt-bindings: Add LED_FUNCTION definitions Jacek Anaszewski
2018-11-07 8:36 ` Vokáč Michal
2018-11-07 19:28 ` Jacek Anaszewski
2018-11-08 15:13 ` Rob Herring
2018-11-08 21:03 ` Jacek Anaszewski
2018-11-11 11:31 ` Pavel Machek
2018-11-11 20:02 ` Jacek Anaszewski
2018-11-11 20:20 ` Pavel Machek
2018-11-11 21:16 ` Jacek Anaszewski
2018-11-12 0:25 ` Vesa Jääskeläinen
2018-11-12 16:01 ` Jacek Anaszewski
2018-11-15 9:16 ` Linus Walleij
2018-11-06 22:07 ` [PATCH 04/24] dt-bindings: leds: Add function and color properties Jacek Anaszewski
2018-11-08 18:00 ` Dan Murphy
2018-11-08 20:47 ` Jacek Anaszewski
2018-11-08 21:08 ` Dan Murphy
2018-11-09 20:00 ` Jacek Anaszewski
2018-11-09 8:32 ` Vesa Jääskeläinen
2018-11-09 20:42 ` Jacek Anaszewski
2018-11-10 17:19 ` Vesa Jääskeläinen
2018-11-12 16:02 ` Jacek Anaszewski
2018-11-13 7:10 ` Vesa Jääskeläinen
2018-11-13 19:02 ` Jacek Anaszewski
[not found] ` <5bea0eb8.1c69fb81.6b921.80e6@mx.google.com>
2018-11-13 20:57 ` Jacek Anaszewski
2018-11-27 20:37 ` Jacek Anaszewski
2018-11-30 14:38 ` Rob Herring
2018-11-30 21:08 ` Pavel Machek
2018-11-30 22:19 ` Rob Herring
2018-12-01 21:17 ` Jacek Anaszewski
2018-12-11 17:27 ` Rob Herring
2018-12-11 22:44 ` Pavel Machek
2018-12-21 10:12 ` Linus Walleij
2018-12-12 9:59 ` Pavel Machek
2018-12-12 13:56 ` Rob Herring
2018-12-12 18:32 ` Pavel Machek
2018-12-23 20:11 ` Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 05/24] dt-bindings: sc27xx-blt: " Jacek Anaszewski
2018-11-11 14:29 ` Pavel Machek
2018-11-11 20:03 ` Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 06/24] leds: sc27xx-blt: Use led_compose_name() Jacek Anaszewski
2018-11-07 7:22 ` Baolin Wang
2018-11-11 14:31 ` Pavel Machek
2018-11-06 22:07 ` [PATCH 07/24] dt-bindings: lt3593: Add function and color properties Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 08/24] leds: lt3593: Use led_compose_name() Jacek Anaszewski
2018-11-07 19:37 ` Daniel Mack
2018-11-07 19:49 ` Jacek Anaszewski
2018-11-08 8:33 ` Daniel Mack
2018-11-06 22:07 ` [PATCH 09/24] dt-bindings: lp8860: Add function and color properties Jacek Anaszewski
2018-11-08 18:01 ` Dan Murphy
2018-11-06 22:07 ` [PATCH 10/24] leds: lp8860: Use led_compose_name() Jacek Anaszewski
2018-11-08 18:16 ` Dan Murphy
2018-11-08 20:48 ` Jacek Anaszewski
2018-11-12 14:05 ` Dan Murphy
2018-11-06 22:07 ` [PATCH 11/24] dt-bindings: lm3692x: Add function and color properties Jacek Anaszewski
2018-11-08 18:12 ` Dan Murphy
2018-11-06 22:07 ` [PATCH 12/24] leds: lm3692x: Use led_compose_name() Jacek Anaszewski
2018-11-08 18:14 ` Dan Murphy
2018-11-08 20:48 ` Jacek Anaszewski [this message]
2018-11-08 21:11 ` Dan Murphy
2018-11-11 14:31 ` Pavel Machek
2018-11-06 22:07 ` [PATCH 13/24] dt-bindings: lm36010: Add function and color properties Jacek Anaszewski
2018-11-08 18:15 ` Dan Murphy
2018-11-06 22:07 ` [PATCH 14/24] leds: lm3601x: Use led_compose_name() Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 15/24] dt-bindings: cr0014114: Add function and color properties Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 16/24] leds: cr0014114: Use led_compose_name() Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 17/24] dt-bindings: aat1290: Add function and color properties Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 18/24] leds: aat1290: Use led_compose_name() Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 19/24] dt-bindings: as3645a: Add function and color properties Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 20/24] leds: as3645a: Use led_compose_name() Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 21/24] dt-bindings: leds-gpio: Add function and color properties Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 22/24] leds: gpio: Use led_compose_name() Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 23/24] dt-bindings: an30259a: Add function and color properties Jacek Anaszewski
2018-11-06 22:07 ` [PATCH 24/24] leds: an30259a: Use led_compose_name() Jacek Anaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a58cdce3-3d15-0ab4-de98-01e526a142a1@gmail.com \
--to=jacek.anaszewski@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dmurphy@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).