aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/rockchip/clk-ddr.c
diff options
context:
space:
mode:
authorEnric Balletbo i Serra <enric.balletbo@collabora.com>2018-10-16 09:41:44 -0400
committerHeiko Stuebner <heiko@sntech.de>2018-10-17 09:12:51 -0400
commit665636b2940d0897c4130253467f5e8c42eea392 (patch)
treed8b381ddd6e95f347ea889d4cd05c94a331f4305 /drivers/clk/rockchip/clk-ddr.c
parentcca8196bdfc2273df057e162bad58085d1c81a01 (diff)
clk: rockchip: Fix static checker warning in rockchip_ddrclk_get_parent call
Fixes the signedness bug returning '(-22)' on the return type by removing the sanity checker in rockchip_ddrclk_get_parent(). The function should return and unsigned value only and it's safe to remove the sanity checker as the core functions that call get_parent like clk_core_get_parent_by_index already ensures the validity of the clk index returned (index >= core->num_parents). Fixes: a4f182bf81f18 ("clk: rockchip: add new clock-type for the ddrclk") Cc: stable@vger.kernel.org Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Reviewed-by: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'drivers/clk/rockchip/clk-ddr.c')
-rw-r--r--drivers/clk/rockchip/clk-ddr.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c
index e8075359366b..ebce5260068b 100644
--- a/drivers/clk/rockchip/clk-ddr.c
+++ b/drivers/clk/rockchip/clk-ddr.c
@@ -80,16 +80,12 @@ static long rockchip_ddrclk_sip_round_rate(struct clk_hw *hw,
80static u8 rockchip_ddrclk_get_parent(struct clk_hw *hw) 80static u8 rockchip_ddrclk_get_parent(struct clk_hw *hw)
81{ 81{
82 struct rockchip_ddrclk *ddrclk = to_rockchip_ddrclk_hw(hw); 82 struct rockchip_ddrclk *ddrclk = to_rockchip_ddrclk_hw(hw);
83 int num_parents = clk_hw_get_num_parents(hw);
84 u32 val; 83 u32 val;
85 84
86 val = clk_readl(ddrclk->reg_base + 85 val = clk_readl(ddrclk->reg_base +
87 ddrclk->mux_offset) >> ddrclk->mux_shift; 86 ddrclk->mux_offset) >> ddrclk->mux_shift;
88 val &= GENMASK(ddrclk->mux_width - 1, 0); 87 val &= GENMASK(ddrclk->mux_width - 1, 0);
89 88
90 if (val >= num_parents)
91 return -EINVAL;
92
93 return val; 89 return val;
94} 90}
95 91