diff options
author | Stephen Boyd <sboyd@kernel.org> | 2023-12-17 03:30:45 +0300 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2023-12-17 03:30:45 +0300 |
commit | 72449a9035f80a0a1f50580147c2c07c8ab391df (patch) | |
tree | b25d245e6ea8bd770206582c86ed865a80c61ef6 | |
parent | b85ea95d086471afb4ad062012a4d73cd328fa86 (diff) | |
parent | 89e00444cb894a42c33ba88738eaae788b05b924 (diff) | |
download | linux-72449a9035f80a0a1f50580147c2c07c8ab391df.tar.xz |
Merge tag 'sunxi-clk-for-6.8-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-allwinner
Pull an Allwinner clk driver update from Jernej Skrabec:
- cleanup variable init in Allwinner nkm module
* tag 'sunxi-clk-for-6.8-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
clk: sunxi-ng: nkm: remove redundant initialization of tmp_parent
-rw-r--r-- | drivers/clk/sunxi-ng/ccu_nkm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/clk/sunxi-ng/ccu_nkm.c b/drivers/clk/sunxi-ng/ccu_nkm.c index eed64547ad42..853f84398e2b 100644 --- a/drivers/clk/sunxi-ng/ccu_nkm.c +++ b/drivers/clk/sunxi-ng/ccu_nkm.c @@ -21,17 +21,16 @@ static unsigned long ccu_nkm_find_best_with_parent_adj(struct ccu_common *common unsigned long *parent, unsigned long rate, struct _ccu_nkm *nkm) { - unsigned long best_rate = 0, best_parent_rate = *parent, tmp_parent = *parent; + unsigned long best_rate = 0, best_parent_rate = *parent; unsigned long best_n = 0, best_k = 0, best_m = 0; unsigned long _n, _k, _m; for (_k = nkm->min_k; _k <= nkm->max_k; _k++) { for (_n = nkm->min_n; _n <= nkm->max_n; _n++) { for (_m = nkm->min_m; _m <= nkm->max_m; _m++) { - unsigned long tmp_rate; + unsigned long tmp_rate, tmp_parent; tmp_parent = clk_hw_round_rate(parent_hw, rate * _m / (_n * _k)); - tmp_rate = tmp_parent * _n * _k / _m; if (ccu_is_better_rate(common, rate, tmp_rate, best_rate) || |