From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
To: Pavel Machek <pavel@ucw.cz>, Lee Jones <lee@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Gene Chen <gene_chen@richtek.com>,
Jacek Anaszewski <jacek.anaszewski@gmail.com>,
Bartosz Golaszewski <brgl@bgdev.pl>,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-sunxi@lists.linux.dev,
Javier Carrasco <javier.carrasco.cruz@gmail.com>
Subject: [PATCH 11/18] leds: max77650: switch to device_for_each_child_node_scoped()
Date: Fri, 27 Sep 2024 01:21:02 +0200 [thread overview]
Message-ID: <20240927-leds_device_for_each_child_node_scoped-v1-11-95c0614b38c8@gmail.com> (raw)
In-Reply-To: <20240927-leds_device_for_each_child_node_scoped-v1-0-95c0614b38c8@gmail.com>
Switch to device_for_each_child_node_scoped() to simplify the code by
removing the need for calls to fwnode_handle_put() in the error paths.
This also prevents possible memory leaks if new error paths are added
without the required call to fwnode_handle_put().
After switching to the scoped variant, there is no longer need for a
jump to 'err_node_out', as an immediate return is possible.
Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
---
drivers/leds/leds-max77650.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/leds/leds-max77650.c b/drivers/leds/leds-max77650.c
index 1eeac56b0014..f8c47078a3bb 100644
--- a/drivers/leds/leds-max77650.c
+++ b/drivers/leds/leds-max77650.c
@@ -62,7 +62,6 @@ static int max77650_led_brightness_set(struct led_classdev *cdev,
static int max77650_led_probe(struct platform_device *pdev)
{
- struct fwnode_handle *child;
struct max77650_led *leds, *led;
struct device *dev;
struct regmap *map;
@@ -84,14 +83,12 @@ static int max77650_led_probe(struct platform_device *pdev)
if (!num_leds || num_leds > MAX77650_LED_NUM_LEDS)
return -ENODEV;
- device_for_each_child_node(dev, child) {
+ device_for_each_child_node_scoped(dev, child) {
struct led_init_data init_data = {};
rv = fwnode_property_read_u32(child, "reg", ®);
- if (rv || reg >= MAX77650_LED_NUM_LEDS) {
- rv = -EINVAL;
- goto err_node_put;
- }
+ if (rv || reg >= MAX77650_LED_NUM_LEDS)
+ return -EINVAL;
led = &leds[reg];
led->map = map;
@@ -108,23 +105,20 @@ static int max77650_led_probe(struct platform_device *pdev)
rv = devm_led_classdev_register_ext(dev, &led->cdev,
&init_data);
if (rv)
- goto err_node_put;
+ return rv;
rv = regmap_write(map, led->regA, MAX77650_LED_A_DEFAULT);
if (rv)
- goto err_node_put;
+ return rv;
rv = regmap_write(map, led->regB, MAX77650_LED_B_DEFAULT);
if (rv)
- goto err_node_put;
+ return rv;
}
return regmap_write(map,
MAX77650_REG_CNFG_LED_TOP,
MAX77650_LED_TOP_DEFAULT);
-err_node_put:
- fwnode_handle_put(child);
- return rv;
}
static const struct of_device_id max77650_led_of_match[] = {
--
2.43.0
next prev parent reply other threads:[~2024-09-26 23:36 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-26 23:20 [PATCH 00/18] leds: switch to device_for_each_child_node_scoped() Javier Carrasco
2024-09-26 23:20 ` [PATCH 01/18] leds: flash: mt6360: fix device_for_each_child_node() refcounting in error paths Javier Carrasco
2024-09-26 23:20 ` [PATCH 02/18] leds: flash: mt6370: switch to device_for_each_child_node_scoped() Javier Carrasco
2024-09-26 23:20 ` [PATCH 03/18] leds: flash: leds-qcom-flash: " Javier Carrasco
2024-09-26 23:20 ` [PATCH 04/18] leds: aw200xx: " Javier Carrasco
2024-09-26 23:20 ` [PATCH 05/18] leds: cr0014114: " Javier Carrasco
2024-11-23 19:31 ` Andy Shevchenko
2024-09-26 23:20 ` [PATCH 06/18] leds: el15203000: " Javier Carrasco
2024-11-23 19:34 ` Andy Shevchenko
2024-09-26 23:20 ` [PATCH 07/18] leds: gpio: " Javier Carrasco
2024-11-23 19:35 ` Andy Shevchenko
2024-09-26 23:20 ` [PATCH 08/18] leds: lm3532: " Javier Carrasco
2024-11-23 19:37 ` Andy Shevchenko
2024-09-26 23:21 ` [PATCH 09/18] leds: lm3697: " Javier Carrasco
2024-11-23 19:37 ` Andy Shevchenko
2024-09-26 23:21 ` [PATCH 10/18] leds: lp50xx: " Javier Carrasco
2024-09-26 23:21 ` Javier Carrasco [this message]
2024-09-27 6:36 ` [PATCH 11/18] leds: max77650: " Bartosz Golaszewski
2024-11-23 19:47 ` Andy Shevchenko
2024-09-26 23:21 ` [PATCH 12/18] leds: ns2: " Javier Carrasco
2024-09-26 23:21 ` [PATCH 13/18] leds: pca963x: " Javier Carrasco
2024-11-23 19:45 ` Andy Shevchenko
2024-09-26 23:21 ` [PATCH 14/18] leds: pwm: " Javier Carrasco
2024-09-26 23:21 ` [PATCH 15/18] leds: sun50i-a100: " Javier Carrasco
2024-11-23 19:41 ` Andy Shevchenko
2024-09-26 23:21 ` [PATCH 16/18] leds: tca6507: " Javier Carrasco
2024-11-23 19:40 ` Andy Shevchenko
2024-09-26 23:21 ` [PATCH 17/18] leds: rgb: ktd202x: " Javier Carrasco
2024-09-26 23:21 ` [PATCH 18/18] leds: rgb: mt6370: " Javier Carrasco
2024-10-09 14:20 ` [PATCH 00/18] leds: " Lee Jones
2024-11-23 19:29 ` Andy Shevchenko
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=20240927-leds_device_for_each_child_node_scoped-v1-11-95c0614b38c8@gmail.com \
--to=javier.carrasco.cruz@gmail.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=brgl@bgdev.pl \
--cc=gene_chen@richtek.com \
--cc=jacek.anaszewski@gmail.com \
--cc=jernej.skrabec@gmail.com \
--cc=lee@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=matthias.bgg@gmail.com \
--cc=pavel@ucw.cz \
--cc=samuel@sholland.org \
--cc=wens@csie.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).