From: Brian Masney <bmasney@redhat.com>
To: Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Florian Fainelli <florian.fainelli@broadcom.com>,
Ray Jui <rjui@broadcom.com>,
Scott Branden <sbranden@broadcom.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@broadcom.com>,
Bjorn Andersson <andersson@kernel.org>,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Maxime Ripard <mripard@redhat.com>
Cc: linux-clk@vger.kernel.org, linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-sunxi@lists.linux.dev, Brian Masney <bmasney@redhat.com>
Subject: [PATCH 09/10] clk: sunxi-ng: ccu_nkmp: convert from round_rate() to determine_rate()
Date: Thu, 03 Jul 2025 19:22:33 -0400 [thread overview]
Message-ID: <20250703-clk-cocci-drop-round-rate-v1-9-3a8da898367e@redhat.com> (raw)
In-Reply-To: <20250703-clk-cocci-drop-round-rate-v1-0-3a8da898367e@redhat.com>
The round_rate() clk ops is deprecated, so migrate this driver from
round_rate() to determine_rate() using the Coccinelle semantic patch
on the cover letter of this series.
Signed-off-by: Brian Masney <bmasney@redhat.com>
---
drivers/clk/sunxi-ng/ccu_nkmp.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/clk/sunxi-ng/ccu_nkmp.c b/drivers/clk/sunxi-ng/ccu_nkmp.c
index 6e03b69d402848b237154319d2296ffb4133a213..25efb5b3760759f2943737856246ce93000ebf05 100644
--- a/drivers/clk/sunxi-ng/ccu_nkmp.c
+++ b/drivers/clk/sunxi-ng/ccu_nkmp.c
@@ -127,20 +127,20 @@ static unsigned long ccu_nkmp_recalc_rate(struct clk_hw *hw,
return rate;
}
-static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,
- unsigned long *parent_rate)
+static int ccu_nkmp_determine_rate(struct clk_hw *hw,
+ struct clk_rate_request *req)
{
struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw);
struct _ccu_nkmp _nkmp;
if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
- rate *= nkmp->fixed_post_div;
+ req->rate *= nkmp->fixed_post_div;
- if (nkmp->max_rate && rate > nkmp->max_rate) {
- rate = nkmp->max_rate;
+ if (nkmp->max_rate && req->rate > nkmp->max_rate) {
+ req->rate = nkmp->max_rate;
if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
- rate /= nkmp->fixed_post_div;
- return rate;
+ req->rate /= nkmp->fixed_post_div;
+ return 0;
}
_nkmp.min_n = nkmp->n.min ?: 1;
@@ -152,12 +152,13 @@ static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate,
_nkmp.min_p = 1;
_nkmp.max_p = nkmp->p.max ?: 1 << ((1 << nkmp->p.width) - 1);
- rate = ccu_nkmp_find_best(*parent_rate, rate, &_nkmp);
+ req->rate = ccu_nkmp_find_best(req->best_parent_rate, req->rate,
+ &_nkmp);
if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
- rate = rate / nkmp->fixed_post_div;
+ req->rate = req->rate / nkmp->fixed_post_div;
- return rate;
+ return 0;
}
static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -227,7 +228,7 @@ const struct clk_ops ccu_nkmp_ops = {
.is_enabled = ccu_nkmp_is_enabled,
.recalc_rate = ccu_nkmp_recalc_rate,
- .round_rate = ccu_nkmp_round_rate,
+ .determine_rate = ccu_nkmp_determine_rate,
.set_rate = ccu_nkmp_set_rate,
};
EXPORT_SYMBOL_NS_GPL(ccu_nkmp_ops, "SUNXI_CCU");
--
2.50.0
next prev parent reply other threads:[~2025-07-03 23:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-03 23:22 [PATCH 00/10] clk: convert drivers from deprecated round_rate() to determine_rate() Brian Masney
2025-07-03 23:22 ` [PATCH 01/10] clk: bcm: bcm2835: convert from " Brian Masney
2025-07-09 0:06 ` Florian Fainelli
2025-07-24 21:32 ` Stephen Boyd
2025-07-03 23:22 ` [PATCH 02/10] clk: qcom: gcc-ipq4019: " Brian Masney
2025-07-09 12:55 ` Maxime Ripard
2025-07-03 23:22 ` [PATCH 03/10] clk: qcom: rpm: " Brian Masney
2025-07-08 13:08 ` Konrad Dybcio
2025-07-03 23:22 ` [PATCH 04/10] clk: qcom: rpmh: " Brian Masney
2025-07-08 13:08 ` Konrad Dybcio
2025-07-03 23:22 ` [PATCH 05/10] clk: qcom: smd-rpm: " Brian Masney
2025-07-08 13:08 ` Konrad Dybcio
2025-07-03 23:22 ` [PATCH 06/10] clk: qcom: spmi-pmic-div: " Brian Masney
2025-07-08 13:09 ` Konrad Dybcio
2025-07-03 23:22 ` [PATCH 07/10] clk: sunxi-ng: ccu_gate: " Brian Masney
2025-07-09 12:55 ` Maxime Ripard
2025-07-03 23:22 ` [PATCH 08/10] clk: sunxi-ng: ccu_nk: " Brian Masney
2025-07-09 12:57 ` Maxime Ripard
2025-07-03 23:22 ` Brian Masney [this message]
2025-07-09 12:59 ` [PATCH 09/10] clk: sunxi-ng: ccu_nkmp: " Maxime Ripard
2025-07-03 23:22 ` [PATCH 10/10] clk: sunxi-ng: ccu_nm: " Brian Masney
2025-07-09 13:00 ` Maxime Ripard
2025-07-14 7:21 ` (subset) [PATCH 00/10] clk: convert drivers from deprecated " Chen-Yu Tsai
2025-07-17 4:30 ` Bjorn Andersson
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=20250703-clk-cocci-drop-round-rate-v1-9-3a8da898367e@redhat.com \
--to=bmasney@redhat.com \
--cc=andersson@kernel.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=florian.fainelli@broadcom.com \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=mripard@redhat.com \
--cc=mturquette@baylibre.com \
--cc=rjui@broadcom.com \
--cc=samuel@sholland.org \
--cc=sboyd@kernel.org \
--cc=sbranden@broadcom.com \
--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).