From: Nishka Dasgupta <nishkadg.linux@gmail.com>
To: lgirdwood@gmail.com, broonie@kernel.org, linux-kernel@vger.kernel.org
Cc: Nishka Dasgupta <nishkadg.linux@gmail.com>
Subject: [PATCH v2] regulator: core: Add label to collate of_node_put() statements
Date: Thu, 15 Aug 2019 11:07:04 +0530 [thread overview]
Message-ID: <20190815053704.32156-1-nishkadg.linux@gmail.com> (raw)
In-Reply-To: <20190813112156.GB5093@sirena.co.uk>
In function of_get_child_regulator(), the loop for_each_child_of_node()
contains two mid-loop return statements, each preceded by a statement
putting child. In order to reduce this repetition, create a new label,
err_node_put, that puts child and then returns the required value;
edit the mid-loop return blocks to instead go to this new label.
Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
---
Changes in v2:
- Submit this as a separate patch instead of updating a previous patch.
drivers/regulator/core.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 7a5d52948703..4a27a46ec6e7 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -380,16 +380,17 @@ static struct device_node *of_get_child_regulator(struct device_node *parent,
if (!regnode) {
regnode = of_get_child_regulator(child, prop_name);
- if (regnode) {
- of_node_put(child);
- return regnode;
- }
+ if (regnode)
+ goto err_node_put;
} else {
- of_node_put(child);
- return regnode;
+ goto err_node_put;
}
}
return NULL;
+
+err_node_put:
+ of_node_put(child);
+ return regnode;
}
/**
--
2.19.1
next prev parent reply other threads:[~2019-08-15 5:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-08 7:05 [PATCH v2] regulator: core: Add of_node_put() before return Nishka Dasgupta
2019-08-08 12:27 ` Mark Brown
2019-08-13 4:27 ` Nishka Dasgupta
2019-08-13 11:21 ` Mark Brown
2019-08-15 5:37 ` Nishka Dasgupta [this message]
2019-08-15 17:14 ` Applied "regulator: core: Add label to collate of_node_put() statements" to the regulator tree Mark Brown
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=20190815053704.32156-1-nishkadg.linux@gmail.com \
--to=nishkadg.linux@gmail.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.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
all inboxes | Powered by JetHome®