summaryrefslogtreecommitdiffstats
path: root/drivers/clk/versatile
diff options
context:
space:
mode:
authorBrian Starkey2017-11-13 16:27:51 +0100
committerStephen Boyd2018-03-16 23:31:16 +0100
commita1d803d78b9e1ff82a0e5ef9d81202b23377f9e0 (patch)
tree9600f3badded5e293782461fd6bb980716aba5f8 /drivers/clk/versatile
parentclk: versatile: add min/max rate boundaries for vexpress osc clock (diff)
downloadkernel-qcow2-linux-a1d803d78b9e1ff82a0e5ef9d81202b23377f9e0.tar.gz
kernel-qcow2-linux-a1d803d78b9e1ff82a0e5ef9d81202b23377f9e0.tar.xz
kernel-qcow2-linux-a1d803d78b9e1ff82a0e5ef9d81202b23377f9e0.zip
clk: versatile: Remove WARNs in ->round_rate()
clk_round_rate() is intended to be used to round a given clock rate to the closest one achievable by the actual clock. This implies that the input to clk_round_rate() is expected to be unachievable - and such cases shouldn't be treated as exceptional. To reflect this, remove the WARN_ONs which trigger when an unachievable clock rate is passed to vexpress_osc_round_rate(). Reported-by: Vladimir Murzin <vladimir.murzin@arm.com> Signed-off-by: Brian Starkey <brian.starkey@arm.com> Acked-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers/clk/versatile')
-rw-r--r--drivers/clk/versatile/clk-vexpress-osc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c
index d3b5af2a02ab..dd08ecb498be 100644
--- a/drivers/clk/versatile/clk-vexpress-osc.c
+++ b/drivers/clk/versatile/clk-vexpress-osc.c
@@ -44,10 +44,10 @@ static long vexpress_osc_round_rate(struct clk_hw *hw, unsigned long rate,
{
struct vexpress_osc *osc = to_vexpress_osc(hw);
- if (WARN_ON(osc->rate_min && rate < osc->rate_min))
+ if (osc->rate_min && rate < osc->rate_min)
rate = osc->rate_min;
- if (WARN_ON(osc->rate_max && rate > osc->rate_max))
+ if (osc->rate_max && rate > osc->rate_max)
rate = osc->rate_max;
return rate;