From: "Vinícius Lima" <viniciusflima@usp.br>
To: marius.cristea@microchip.com, jic23@kernel.org
Cc: "Vinícius Henrique Ferraz Lima" <viniciusflima@usp.br>,
"Lucas Quaresma" <lucasqml08@usp.br>,
linux-iio@vger.kernel.org
Subject: [PATCH] iio: adc: mcp3564.c: Use device_for_each_child_node_scoped() to simplify error paths
Date: Thu, 23 May 2024 13:24:35 -0300 [thread overview]
Message-ID: <20240523162437.3823-1-viniciusflima@usp.br> (raw)
From: Vinícius Henrique Ferraz Lima <viniciusflima@usp.br>
Use another method to automatically release the handle on early exit,
reducing leaks.
Co-developed-by: Lucas Quaresma <lucasqml08@usp.br>
Signed-off-by: Lucas Quaresma <lucasqml08@usp.br>
Signed-off-by: Vinícius Lima <viniciusflima@usp.br>
---
drivers/iio/adc/mcp3564.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/iio/adc/mcp3564.c b/drivers/iio/adc/mcp3564.c
index 311b613b6..52c864974 100644
--- a/drivers/iio/adc/mcp3564.c
+++ b/drivers/iio/adc/mcp3564.c
@@ -998,7 +998,6 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
struct mcp3564_state *adc = iio_priv(indio_dev);
struct device *dev = &adc->spi->dev;
struct iio_chan_spec *channels;
- struct fwnode_handle *child;
struct iio_chan_spec chanspec = mcp3564_channel_template;
struct iio_chan_spec temp_chanspec = mcp3564_temp_channel_template;
struct iio_chan_spec burnout_chanspec = mcp3564_burnout_channel_template;
@@ -1025,7 +1024,7 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
if (!channels)
return dev_err_probe(dev, -ENOMEM, "Can't allocate memory\n");
- device_for_each_child_node(dev, child) {
+ device_for_each_child_node_scoped(dev, child) {
node_name = fwnode_get_name(child);
if (fwnode_property_present(child, "diff-channels")) {
@@ -1041,13 +1040,11 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
inputs[1] = MCP3564_AGND;
}
if (ret) {
- fwnode_handle_put(child);
return ret;
}
if (inputs[0] > MCP3564_INTERNAL_VCM ||
inputs[1] > MCP3564_INTERNAL_VCM) {
- fwnode_handle_put(child);
return dev_err_probe(&indio_dev->dev, -EINVAL,
"Channel index > %d, for %s\n",
MCP3564_INTERNAL_VCM + 1,
--
2.45.0
next reply other threads:[~2024-05-23 16:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-23 16:24 Vinícius Lima [this message]
2024-05-23 16:39 ` [PATCH] iio: adc: mcp3564.c: Use device_for_each_child_node_scoped() to simplify error paths Jonathan Cameron
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=20240523162437.3823-1-viniciusflima@usp.br \
--to=viniciusflima@usp.br \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=lucasqml08@usp.br \
--cc=marius.cristea@microchip.com \
/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