The following commit has been merged into the timers/core branch of tip: Commit-ID: dca54f8ce1c3c979caf06cfdcdf8eab05a00f5ff Gitweb: https://git.kernel.org/tip/dca54f8ce1c3c979caf06cfdcdf8eab05a00f5ff Author: Kefeng Wang <wangkefeng.w...@huawei.com> AuthorDate: Thu, 29 Oct 2020 20:33:16 +08:00 Committer: Daniel Lezcano <daniel.lezc...@linaro.org> CommitterDate: Thu, 03 Dec 2020 19:16:17 +01:00
clocksource/drivers/sp804: Correct clk_get_rate handle clk_get_rate won't return negative value, correct clk_get_rate handle. Signed-off-by: Kefeng Wang <wangkefeng.w...@huawei.com> Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org> Link: https://lore.kernel.org/r/20201029123317.90286-4-wangkefeng.w...@huawei.com --- drivers/clocksource/timer-sp804.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c index d74788b..fcce839 100644 --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -58,7 +58,6 @@ static struct sp804_clkevt sp804_clkevt[NR_TIMERS]; static long __init sp804_get_clock_rate(struct clk *clk, const char *name) { - long rate; int err; if (!clk) @@ -75,14 +74,7 @@ static long __init sp804_get_clock_rate(struct clk *clk, const char *name) return err; } - rate = clk_get_rate(clk); - if (rate < 0) { - pr_err("sp804: clock failed to get rate: %ld\n", rate); - clk_disable_unprepare(clk); - clk_put(clk); - } - - return rate; + return clk_get_rate(clk); } static struct sp804_clkevt * __init sp804_clkevt_get(void __iomem *base)
