From: Chen-Yu Tsai <wenst@chromium.org>
To: Stephen Boyd <sboyd@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Matthias Brugger <matthias.bgg@gmail.com>
Cc: Chen-Yu Tsai <wenst@chromium.org>,
Chun-Jie Chen <chun-jie.chen@mediatek.com>,
Miles Chen <miles.chen@mediatek.com>,
linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 23/31] clk: mediatek: mux: Reverse check for existing clk to reduce nesting level
Date: Wed, 2 Feb 2022 21:48:26 +0800 [thread overview]
Message-ID: <20220202134834.690675-24-wenst@chromium.org> (raw)
In-Reply-To: <20220202134834.690675-1-wenst@chromium.org>
The clk registration code here currently does:
if (IS_ERR_OR_NULL(clk_data->clks[mux->id])) {
... do clk registration ...
}
This extra level of nesting wastes screen real estate.
Reduce the nesting level by reversing the conditional shown above.
Other than that, functionality is not changed.
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: Miles Chen <miles.chen@mediatek.com>
---
drivers/clk/mediatek/clk-mux.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/clk/mediatek/clk-mux.c b/drivers/clk/mediatek/clk-mux.c
index 01af6a52711a..70aa42144632 100644
--- a/drivers/clk/mediatek/clk-mux.c
+++ b/drivers/clk/mediatek/clk-mux.c
@@ -208,16 +208,17 @@ int mtk_clk_register_muxes(const struct mtk_mux *muxes,
for (i = 0; i < num; i++) {
const struct mtk_mux *mux = &muxes[i];
- if (IS_ERR_OR_NULL(clk_data->clks[mux->id])) {
- clk = mtk_clk_register_mux(mux, regmap, lock);
+ if (!IS_ERR_OR_NULL(clk_data->clks[mux->id]))
+ continue;
- if (IS_ERR(clk)) {
- pr_err("Failed to register clk %s: %pe\n", mux->name, clk);
- continue;
- }
+ clk = mtk_clk_register_mux(mux, regmap, lock);
- clk_data->clks[mux->id] = clk;
+ if (IS_ERR(clk)) {
+ pr_err("Failed to register clk %s: %pe\n", mux->name, clk);
+ continue;
}
+
+ clk_data->clks[mux->id] = clk;
}
return 0;
--
2.35.0.rc2.247.g8bbb082509-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-02-02 14:09 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-02 13:48 [PATCH v2 00/31] clk: mediatek: Cleanups and Improvements - Part 1 Chen-Yu Tsai
2022-02-02 13:48 ` [PATCH v2 01/31] clk: mediatek: Use %pe to print errors Chen-Yu Tsai
2022-02-03 9:51 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 02/31] clk: mediatek: gate: Consolidate gate type clk related code Chen-Yu Tsai
2022-02-03 9:51 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 03/31] clk: mediatek: gate: Internalize clk implementation Chen-Yu Tsai
2022-02-03 9:51 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 04/31] clk: mediatek: gate: Implement unregister API Chen-Yu Tsai
2022-02-03 9:51 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 05/31] clk: mediatek: gate: Clean up included headers Chen-Yu Tsai
2022-02-03 9:50 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 06/31] clk: mediatek: cpumux: Implement unregister API Chen-Yu Tsai
2022-02-03 9:50 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 07/31] clk: mediatek: cpumux: Internalize struct mtk_clk_cpumux Chen-Yu Tsai
2022-02-03 9:50 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 08/31] clk: mediatek: cpumux: Clean up included headers Chen-Yu Tsai
2022-02-03 9:50 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 09/31] clk: mediatek: mux: Implement unregister API Chen-Yu Tsai
2022-02-03 9:50 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 10/31] clk: mediatek: mux: Internalize struct mtk_clk_mux Chen-Yu Tsai
2022-02-03 9:50 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 11/31] clk: mediatek: mux: Clean up included headers Chen-Yu Tsai
2022-02-03 9:50 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 12/31] clk: mediatek: pll: Split definitions into separate header file Chen-Yu Tsai
2022-02-03 9:50 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 13/31] clk: mediatek: pll: Implement unregister API Chen-Yu Tsai
2022-02-03 9:50 ` AngeloGioacchino Del Regno
2022-02-07 2:47 ` Miles Chen
2022-02-02 13:48 ` [PATCH v2 14/31] clk: mediatek: pll: Clean up included headers Chen-Yu Tsai
2022-02-03 9:50 ` AngeloGioacchino Del Regno
2022-02-07 2:49 ` Miles Chen
2022-02-02 13:48 ` [PATCH v2 15/31] clk: mediatek: Implement mtk_clk_unregister_fixed_clks() API Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-08 3:50 ` Chen-Yu Tsai
2022-02-08 11:19 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 16/31] clk: mediatek: Implement mtk_clk_unregister_factors() API Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 17/31] clk: mediatek: Implement mtk_clk_unregister_divider_clks() API Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 18/31] clk: mediatek: Implement mtk_clk_unregister_composites() API Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-07 2:51 ` Miles Chen
2022-02-02 13:48 ` [PATCH v2 19/31] clk: mediatek: Add mtk_clk_simple_remove() Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 20/31] clk: mediatek: mtk: Clean up included headers Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 21/31] clk: mediatek: cpumux: Implement error handling in register API Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 22/31] clk: mediatek: gate: " Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` Chen-Yu Tsai [this message]
2022-02-03 9:47 ` [PATCH v2 23/31] clk: mediatek: mux: Reverse check for existing clk to reduce nesting level AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 24/31] clk: mediatek: mux: Implement error handling in register API Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 25/31] clk: mediatek: pll: " Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 26/31] clk: mediatek: mtk: Implement error handling in register APIs Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 27/31] clk: mediatek: Unregister clks in mtk_clk_simple_probe() error path Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 28/31] clk: mediatek: mt8195: Hook up mtk_clk_simple_remove() Chen-Yu Tsai
2022-02-02 13:48 ` [PATCH v2 29/31] clk: mediatek: mt8195: Implement error handling in probe functions Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
2022-02-02 13:48 ` [PATCH v2 30/31] clk: mediatek: mt8195: Implement remove functions Chen-Yu Tsai
2022-02-02 13:48 ` [PATCH v2 31/31] clk: mediatek: Warn if clk IDs are duplicated Chen-Yu Tsai
2022-02-03 9:47 ` AngeloGioacchino Del Regno
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=20220202134834.690675-24-wenst@chromium.org \
--to=wenst@chromium.org \
--cc=chun-jie.chen@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=miles.chen@mediatek.com \
--cc=mturquette@baylibre.com \
--cc=sboyd@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).