From: Stephen Boyd <sboyd@kernel.org>
To: Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org,
Douglas Anderson <dianders@chromium.org>,
Heiko Stuebner <heiko@sntech.de>,
Jerome Brunet <jbrunet@baylibre.com>
Subject: [PATCH v2 2/4] clk: Use 'parent' to shorten lines in __clk_core_init()
Date: Wed, 5 Feb 2020 15:28:00 -0800 [thread overview]
Message-ID: <20200205232802.29184-3-sboyd@kernel.org> (raw)
In-Reply-To: <20200205232802.29184-1-sboyd@kernel.org>
Some lines are getting long in this function. Let's move 'parent' up to
the top of the function and use it in many places whenever there is a
parent for a clk. This shortens some lines by avoiding core->parent->
indirections.
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
---
drivers/clk/clk.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 26213e82f5f9..9ad950178d10 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -3342,6 +3342,7 @@ static void clk_core_reparent_orphans_nolock(void)
static int __clk_core_init(struct clk_core *core)
{
int ret;
+ struct clk_core *parent;
unsigned long rate;
if (!core)
@@ -3413,7 +3414,7 @@ static int __clk_core_init(struct clk_core *core)
goto out;
}
- core->parent = __clk_init_parent(core);
+ parent = core->parent = __clk_init_parent(core);
/*
* Populate core->parent if parent has already been clk_core_init'd. If
@@ -3425,10 +3426,9 @@ static int __clk_core_init(struct clk_core *core)
* clocks and re-parent any that are children of the clock currently
* being clk_init'd.
*/
- if (core->parent) {
- hlist_add_head(&core->child_node,
- &core->parent->children);
- core->orphan = core->parent->orphan;
+ if (parent) {
+ hlist_add_head(&core->child_node, &parent->children);
+ core->orphan = parent->orphan;
} else if (!core->num_parents) {
hlist_add_head(&core->child_node, &clk_root_list);
core->orphan = false;
@@ -3446,9 +3446,9 @@ static int __clk_core_init(struct clk_core *core)
*/
if (core->ops->recalc_accuracy)
core->accuracy = core->ops->recalc_accuracy(core->hw,
- __clk_get_accuracy(core->parent));
- else if (core->parent)
- core->accuracy = core->parent->accuracy;
+ __clk_get_accuracy(parent));
+ else if (parent)
+ core->accuracy = parent->accuracy;
else
core->accuracy = 0;
@@ -3472,9 +3472,9 @@ static int __clk_core_init(struct clk_core *core)
*/
if (core->ops->recalc_rate)
rate = core->ops->recalc_rate(core->hw,
- clk_core_get_rate_nolock(core->parent));
- else if (core->parent)
- rate = core->parent->rate;
+ clk_core_get_rate_nolock(parent));
+ else if (parent)
+ rate = parent->rate;
else
rate = 0;
core->rate = core->req_rate = rate;
--
Sent by a computer, using git, on the internet
next prev parent reply other threads:[~2020-02-05 23:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 23:27 [PATCH v2 0/4] clk_phase error caching problems Stephen Boyd
2020-02-05 23:27 ` [PATCH v2 1/4] clk: Don't cache errors from clk_ops::get_phase() Stephen Boyd
2020-02-06 8:26 ` Jerome Brunet
2020-02-12 23:27 ` Stephen Boyd
2020-02-12 23:28 ` Stephen Boyd
2020-02-05 23:28 ` Stephen Boyd [this message]
2020-02-12 23:28 ` [PATCH v2 2/4] clk: Use 'parent' to shorten lines in __clk_core_init() Stephen Boyd
2020-02-05 23:28 ` [PATCH v2 3/4] clk: Move rate and accuracy recalc to mostly consumer APIs Stephen Boyd
2020-02-12 23:28 ` Stephen Boyd
2020-02-05 23:28 ` [PATCH v2 4/4] clk: Bail out when calculating phase fails during clk registration Stephen Boyd
2020-02-12 23:28 ` Stephen Boyd
2020-02-06 8:27 ` [PATCH v2 0/4] clk_phase error caching problems Jerome Brunet
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=20200205232802.29184-3-sboyd@kernel.org \
--to=sboyd@kernel.org \
--cc=dianders@chromium.org \
--cc=heiko@sntech.de \
--cc=jbrunet@baylibre.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.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;
as well as URLs for NNTP newsgroup(s).