mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 13:22:57 +00:00
Code Issues Releases Wiki Activity

clk: versaclock3: Drop ret variable

Browse source 
Drop ret variable from vc3_clk_mux_determine_rate().

While at it, return the value returned by regmap_*
wherever possible instead of returning 0.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20231122142310.203169-6-biju.das.jz@bp.renesas.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
Biju Das 2023-11-22 14:23:10 +00:00 committed by Stephen Boyd
parent 1235110562
commit b08fa38593
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/clk/clk-versaclock3.c
View file

@ -226,9 +226,8 @@ static int vc3_pfd_mux_set_parent(struct clk_hw *hw, u8 index)
struct vc3_hw_data *vc3 = container_of(hw, struct vc3_hw_data, hw); struct vc3_hw_data *vc3 = container_of(hw, struct vc3_hw_data, hw);
const struct vc3_clk_data *pfd_mux = vc3->data; const struct vc3_clk_data *pfd_mux = vc3->data;
regmap_update_bits(vc3->regmap, pfd_mux->offs, pfd_mux->bitmsk, return regmap_update_bits(vc3->regmap, pfd_mux->offs, pfd_mux->bitmsk,
index ? pfd_mux->bitmsk : 0); index ? pfd_mux->bitmsk : 0);
return 0;
} }
static const struct clk_ops vc3_pfd_mux_ops = { static const struct clk_ops vc3_pfd_mux_ops = {
@ -456,10 +455,8 @@ static int vc3_div_mux_set_parent(struct clk_hw *hw, u8 index)
struct vc3_hw_data *vc3 = container_of(hw, struct vc3_hw_data, hw); struct vc3_hw_data *vc3 = container_of(hw, struct vc3_hw_data, hw);
const struct vc3_clk_data *div_mux = vc3->data; const struct vc3_clk_data *div_mux = vc3->data;
regmap_update_bits(vc3->regmap, div_mux->offs, div_mux->bitmsk, return regmap_update_bits(vc3->regmap, div_mux->offs, div_mux->bitmsk,
index ? div_mux->bitmsk : 0); index ? div_mux->bitmsk : 0);
return 0;
} }
static const struct clk_ops vc3_div_mux_ops = { static const struct clk_ops vc3_div_mux_ops = {
@ -524,10 +521,9 @@ static int vc3_div_set_rate(struct clk_hw *hw, unsigned long rate,
value = divider_get_val(rate, parent_rate, div_data->table, value = divider_get_val(rate, parent_rate, div_data->table,
div_data->width, div_data->flags); div_data->width, div_data->flags);
regmap_update_bits(vc3->regmap, div_data->offs, return regmap_update_bits(vc3->regmap, div_data->offs,
VC3_DIV_MASK(div_data->width) << div_data->shift, VC3_DIV_MASK(div_data->width) << div_data->shift,
value << div_data->shift); value << div_data->shift);
return 0;
} }
static const struct clk_ops vc3_div_ops = { static const struct clk_ops vc3_div_ops = {
@ -539,11 +535,9 @@ static const struct clk_ops vc3_div_ops = {
static int vc3_clk_mux_determine_rate(struct clk_hw *hw, static int vc3_clk_mux_determine_rate(struct clk_hw *hw,
struct clk_rate_request *req) struct clk_rate_request *req)
{ {
int ret;
int frc; int frc;
ret = clk_mux_determine_rate_flags(hw, req, CLK_SET_RATE_PARENT); if (clk_mux_determine_rate_flags(hw, req, CLK_SET_RATE_PARENT)) {
if (ret) {
/* The below check is equivalent to (best_parent_rate/rate) */ /* The below check is equivalent to (best_parent_rate/rate) */
if (req->best_parent_rate >= req->rate) { if (req->best_parent_rate >= req->rate) {
frc = DIV_ROUND_CLOSEST_ULL(req->best_parent_rate, frc = DIV_ROUND_CLOSEST_ULL(req->best_parent_rate,
@ -552,10 +546,9 @@ static int vc3_clk_mux_determine_rate(struct clk_hw *hw,
return clk_mux_determine_rate_flags(hw, req, return clk_mux_determine_rate_flags(hw, req,
CLK_SET_RATE_PARENT); CLK_SET_RATE_PARENT);
} }
ret = 0;
} }
return ret; return 0;
} }
static u8 vc3_clk_mux_get_parent(struct clk_hw *hw) static u8 vc3_clk_mux_get_parent(struct clk_hw *hw)
@ -574,9 +567,8 @@ static int vc3_clk_mux_set_parent(struct clk_hw *hw, u8 index)
struct vc3_hw_data *vc3 = container_of(hw, struct vc3_hw_data, hw); struct vc3_hw_data *vc3 = container_of(hw, struct vc3_hw_data, hw);
const struct vc3_clk_data *clk_mux = vc3->data; const struct vc3_clk_data *clk_mux = vc3->data;
regmap_update_bits(vc3->regmap, clk_mux->offs, return regmap_update_bits(vc3->regmap, clk_mux->offs, clk_mux->bitmsk,
clk_mux->bitmsk, index ? clk_mux->bitmsk : 0); index ? clk_mux->bitmsk : 0);
return 0;
} }
static const struct clk_ops vc3_clk_mux_ops = { static const struct clk_ops vc3_clk_mux_ops = {