[PATCH 1/6] clocksource: sp804: cleanup clk_get_sys()

[Zhen Lei]

From: Kefeng Wang <wangkefeng.w...@huawei.com>

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

Signed-off-by: Kefeng Wang <wangkefeng.w...@huawei.com>
Signed-off-by: Zhen Lei <thunder.leiz...@huawei.com>
---
 drivers/clocksource/timer-sp804.c | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/drivers/clocksource/timer-sp804.c 
b/drivers/clocksource/timer-sp804.c
index 5cd0abf9b396..bec2d372e0df 100644
--- a/drivers/clocksource/timer-sp804.c
+++ b/drivers/clocksource/timer-sp804.c
@@ -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;
 
-- 
2.26.0.106.g9fadedd