Commit 7d19d521 authored by Kefeng Wang's avatar Kefeng Wang Committed by Daniel Lezcano
Browse files

clocksource/drivers/sp804: Cleanup clk_get_sys() 



Move the clk_get_sys() part into sp804_get_clock_rate(), cleanup the same
code.

Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200918132237.3552-2-thunder.leizhen@huawei.com
parent 51b705af

drivers/clocksource/timer-sp804.c

+10 −20
Original line number Diff line number Diff line
@@ -22,11 +22,18 @@ 


#include "timer-sp.h"



static long __init sp804_get_clock_rate(struct clk *clk)

static long __init sp804_get_clock_rate(struct clk *clk, const char *name)

{

	long rate;

	int err;



	if (!clk)

		clk = clk_get_sys("sp804", name);

	if (IS_ERR(clk)) {

		pr_err("sp804: %s clock not found: %ld\n", name, PTR_ERR(clk));

		return PTR_ERR(clk);

	}



	err = clk_prepare(clk);

	if (err) {

		pr_err("sp804: clock failed to prepare: %d\n", err);
@@ -72,16 +79,7 @@ int __init __sp804_clocksource_and_sched_clock_init(void __iomem *base, 
{

	long rate;



	if (!clk) {

		clk = clk_get_sys("sp804", name);

		if (IS_ERR(clk)) {

			pr_err("sp804: clock not found: %d\n",

			       (int)PTR_ERR(clk));

			return PTR_ERR(clk);

		}

	}



	rate = sp804_get_clock_rate(clk);

	rate = sp804_get_clock_rate(clk, name);

	if (rate < 0)

		return -EINVAL;
@@ -173,15 +171,7 @@ int __init __sp804_clockevents_init(void __iomem *base, unsigned int irq, struct 
	struct clock_event_device *evt = &sp804_clockevent;

	long rate;



	if (!clk)

		clk = clk_get_sys("sp804", name);

	if (IS_ERR(clk)) {

		pr_err("sp804: %s clock not found: %d\n", name,

			(int)PTR_ERR(clk));

		return PTR_ERR(clk);

	}



	rate = sp804_get_clock_rate(clk);

	rate = sp804_get_clock_rate(clk, name);

	if (rate < 0)

		return -EINVAL;