From: "Marek Behún" <marek.behun@nic.cz>
To: linux-leds@vger.kernel.org
Cc: "Pavel Machek" <pavel@ucw.cz>, "Dan Murphy" <dmurphy@ti.com>,
"Ondřej Jirman" <megous@megous.com>,
linux-kernel@vger.kernel.org, "Rob Herring" <robh+dt@kernel.org>,
devicetree@vger.kernel.org, "Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH leds v2 34/50] leds: lm36274: use struct led_init_data when registering
Date: Fri, 18 Sep 2020 00:33:22 +0200 [thread overview]
Message-ID: <20200917223338.14164-35-marek.behun@nic.cz> (raw)
In-Reply-To: <20200917223338.14164-1-marek.behun@nic.cz>
By using struct led_init_data when registering we do not need to parse
`label` DT property. Moreover `label` is deprecated and if it is not
present but `color` and `function` are, LED core will compose a name
from these properties instead.
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, nor are `color` and `function`.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Cc: Dan Murphy <dmurphy@ti.com>
---
drivers/leds/leds-lm36274.c | 43 ++++++++++++++++++++++---------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/drivers/leds/leds-lm36274.c b/drivers/leds/leds-lm36274.c
index 4282b7392f2b5..294edcc054bea 100644
--- a/drivers/leds/leds-lm36274.c
+++ b/drivers/leds/leds-lm36274.c
@@ -66,12 +66,11 @@ static int lm36274_init(struct lm36274 *chip)
return regmap_write(chip->regmap, LM36274_REG_BL_EN, enable_val);
}
-static int lm36274_parse_dt(struct lm36274 *chip)
+static int lm36274_parse_dt(struct lm36274 *chip,
+ struct led_init_data *init_data)
{
- struct fwnode_handle *child = NULL;
- char label[LED_MAX_NAME_SIZE];
struct device *dev = &chip->pdev->dev;
- const char *name;
+ struct fwnode_handle *child;
int ret;
/* There should only be 1 node */
@@ -80,43 +79,45 @@ static int lm36274_parse_dt(struct lm36274 *chip)
child = device_get_next_child_node(dev, NULL);
- ret = fwnode_property_read_string(child, "label", &name);
- if (ret)
- snprintf(label, sizeof(label), "%s::", chip->pdev->name);
- else
- snprintf(label, sizeof(label), "%s:%s", chip->pdev->name, name);
+ init_data->fwnode = child;
+ init_data->devicename = chip->pdev->name;
+ /* for backwards compatibility when `label` property is not present */
+ init_data->default_label = ":";
chip->num_leds = fwnode_property_count_u32(child, "led-sources");
- if (chip->num_leds <= 0)
- return -ENODEV;
+ if (chip->num_leds <= 0) {
+ ret = -ENODEV;
+ goto err;
+ }
ret = fwnode_property_read_u32_array(child, "led-sources",
chip->led_sources, chip->num_leds);
if (ret) {
dev_err(dev, "led-sources property missing\n");
- return ret;
+ goto err;
}
fwnode_property_read_string(child, "linux,default-trigger",
&chip->led_dev.default_trigger);
- fwnode_handle_put(child);
-
chip->lmu_data.regmap = chip->regmap;
chip->lmu_data.max_brightness = MAX_BRIGHTNESS_11BIT;
chip->lmu_data.msb_brightness_reg = LM36274_REG_BRT_MSB;
chip->lmu_data.lsb_brightness_reg = LM36274_REG_BRT_LSB;
- chip->led_dev.name = label;
chip->led_dev.max_brightness = MAX_BRIGHTNESS_11BIT;
chip->led_dev.brightness_set_blocking = lm36274_brightness_set;
return 0;
+err:
+ fwnode_handle_put(child);
+ return ret;
}
static int lm36274_probe(struct platform_device *pdev)
{
struct ti_lmu *lmu = dev_get_drvdata(pdev->dev.parent);
+ struct led_init_data init_data = {};
struct lm36274 *chip;
int ret;
@@ -129,7 +130,7 @@ static int lm36274_probe(struct platform_device *pdev)
chip->regmap = lmu->regmap;
platform_set_drvdata(pdev, chip);
- ret = lm36274_parse_dt(chip);
+ ret = lm36274_parse_dt(chip, &init_data);
if (ret) {
dev_err(chip->dev, "Failed to parse DT node\n");
return ret;
@@ -141,7 +142,15 @@ static int lm36274_probe(struct platform_device *pdev)
return ret;
}
- return devm_led_classdev_register(chip->dev, &chip->led_dev);
+ ret = devm_led_classdev_register_ext(chip->dev, &chip->led_dev,
+ &init_data);
+ if (ret)
+ dev_err(chip->dev, "Failed to register LED for node %pfw\n",
+ init_data.fwnode);
+
+ fwnode_handle_put(init_data.fwnode);
+
+ return ret;
}
static const struct of_device_id of_lm36274_leds_match[] = {
--
2.26.2
next prev parent reply other threads:[~2020-09-17 22:34 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 22:32 [PATCH leds v2 00/50] Start moving parsing of `linux,default-trigger` to LED core (a cleanup of LED drivers) Marek Behún
2020-09-17 22:32 ` [PATCH leds v2 01/50] leds: various: compile if COMPILE_TEST=y Marek Behún
2020-09-17 22:32 ` [PATCH leds v2 02/50] leds: ip30: " Marek Behún
2020-09-17 22:32 ` [PATCH leds v2 03/50] leds: fsg: " Marek Behún
2020-09-19 9:56 ` Pavel Machek
2020-09-19 15:54 ` Marek Behun
2020-09-17 22:32 ` [PATCH leds v2 04/50] leds: various: use device_get_match_data Marek Behún
2020-09-17 22:32 ` [PATCH leds v2 05/50] leds: various: guard of_match_table member value with of_match_ptr Marek Behún
2020-09-18 6:15 ` Sakari Ailus
2020-09-18 9:20 ` Marek Behun
2020-09-18 9:57 ` Sakari Ailus
2020-09-18 10:10 ` Marek Behun
2020-09-28 8:03 ` Lee Jones
2020-09-28 8:11 ` Lee Jones
2020-09-28 9:37 ` Sakari Ailus
2020-09-17 22:32 ` [PATCH leds v2 06/50] leds: various: use dev_of_node(dev) instead of dev->of_node Marek Behún
2020-09-17 22:32 ` [PATCH leds v2 07/50] leds: lt3593: do not rewrite .of_node of new LED device to wrong value Marek Behún
2020-09-17 22:32 ` [PATCH leds v2 08/50] leds: various: use only available OF children Marek Behún
2020-09-17 22:32 ` [PATCH leds v2 09/50] leds: various: fix OF node leaks Marek Behún
2020-09-17 22:32 ` [PATCH leds v2 10/50] leds: bcm6328, bcm6358: use devres LED registering function Marek Behún
2020-09-17 22:32 ` [PATCH leds v2 11/50] leds: bcm6328, bcm6358: use struct led_init_data when registering Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 12/50] leds: bcm6328: cosmetic: use reverse christmas tree Marek Behún
2020-09-19 9:18 ` Pavel Machek
2020-09-17 22:33 ` [PATCH leds v2 13/50] leds: bcm6358: " Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 14/50] leds: lm3697: use struct led_init_data when registering Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 15/50] leds: lm3697: cosmetic change: use helper variable, reverse christmas tree Marek Behún
2020-09-18 11:47 ` Dan Murphy
2020-09-18 17:22 ` Marek Behun
2020-09-17 22:33 ` [PATCH leds v2 16/50] leds: max77650: use struct led_init_data when registering Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 17/50] leds: max77650: use reverse christmas tree Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 18/50] leds: mt6323: use struct led_init_data when registering Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 19/50] leds: mt6323: cosmetic change: use helper variable Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 20/50] leds: pm8058: use struct led_init_data when registering Marek Behún
2020-09-29 13:14 ` Linus Walleij
2020-09-17 22:33 ` [PATCH leds v2 21/50] leds: pm8058: cosmetic change: use helper variable Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 22/50] leds: pm8058: cosmetic change: no need to return in if guard Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 23/50] leds: pm8058: cosmetic: use reverse christmas tree Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 24/50] leds: is31fl32xx: use struct led_init_data when registering Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 25/50] leds: is31fl319x: compute aggregated max current separately Marek Behún
2020-09-19 10:20 ` Pavel Machek
2020-09-17 22:33 ` [PATCH leds v2 26/50] leds: is31fl319x: don't store shutdown gpio descriptor Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 27/50] leds: is31fl319x: don't store audio gain value, simply set it Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 28/50] leds: is31fl319x: refactor to register LEDs while parsing DT Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 29/50] leds: is31fl319x: cosmetic: use reverse christmas tree Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 30/50] leds: is31fl319x: use struct led_init_data when registering Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 31/50] leds: lm36274: use devres LED registering function Marek Behún
2020-09-19 10:04 ` Pavel Machek
2020-09-17 22:33 ` [PATCH leds v2 32/50] leds: lm36274: cosmetic: rename lm36274_data to chip Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 33/50] leds: lm36274: don't iterate through children since there is only one Marek Behún
2020-09-17 22:33 ` Marek Behún [this message]
2020-09-17 22:33 ` [PATCH leds v2 35/50] leds: lm36274: do not set chip settings in DT parsing function Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 36/50] leds: ns2: use devres LED registering function Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 37/50] leds: ns2: alloc simple array instead of struct ns2_led_priv Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 38/50] leds: ns2: support OF probing only, forget platdata Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 39/50] leds: ns2: move parsing of one LED into separate function Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 40/50] leds: ns2: use devres API for getting GPIO descriptors Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 41/50] leds: ns2: cosmetic structure rename Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 42/50] leds: ns2: cosmetic variable rename Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 43/50] leds: ns2: cosmetic change Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 44/50] leds: ns2: cosmetic change: use helper variable Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 45/50] leds: ns2: register LED immediately after parsing DT properties Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 46/50] leds: ns2: remove unneeded variable Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 47/50] leds: ns2: cosmetic: use reverse christmas tree Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 48/50] leds: ns2: reorder headers alphabetically Marek Behún
2020-09-19 10:12 ` Pavel Machek
2020-09-17 22:33 ` [PATCH leds v2 49/50] leds: ns2: use struct led_init_data when registering Marek Behún
2020-09-17 22:33 ` [PATCH leds v2 50/50] leds: parse linux,default-trigger DT property in LED core Marek Behún
2020-09-19 10:19 ` Pavel Machek
2020-09-22 17:32 ` [PATCH leds v2 00/50] Start moving parsing of `linux,default-trigger` to LED core (a cleanup of LED drivers) Simon Guinot
2020-09-26 13:47 ` Simon Guinot
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=20200917223338.14164-35-marek.behun@nic.cz \
--to=marek.behun@nic.cz \
--cc=devicetree@vger.kernel.org \
--cc=dmurphy@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=megous@megous.com \
--cc=pavel@ucw.cz \
--cc=robh+dt@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).