clocksource: starfive: Remove struct reset_control

Remove struct reset_control from starfive_clkevt struct, uses local
struct reset_control instead.

Signed-off-by: Ley Foon Tan <leyfoon.tan@linux.starfivetech.com>

diff --git a/drivers/clocksource/timer-starfive.c b/drivers/clocksource/timer-starfive.c
index ea1f41b..62399f8 100755 (executable)
--- a/drivers/clocksource/timer-starfive.c
+++ b/drivers/clocksource/timer-starfive.c
@@ -399,7 +399,6 @@ static int __init do_starfive_timer_of_init(struct device_node *np,
 
                rst = of_reset_control_get(np, name);
                if (!IS_ERR(rst)) {
-                       clkevt->rst = rst;
                        reset_control_assert(rst);
                        reset_control_deassert(rst);
                }
@@ -433,9 +432,9 @@ init_err:
 register_err:
        free_irq(clkevt->irq, &clkevt->evt);
 irq_err:
-       if (!clkevt->rst) {
-               reset_control_assert(clkevt->rst);
-               reset_control_put(clkevt->rst);
+       if (!rst) {
+               reset_control_assert(rst);
+               reset_control_put(rst);
        }
        if (!clkevt->clk) {
                clk_disable_unprepare(clkevt->clk);

diff --git a/drivers/clocksource/timer-starfive.h b/drivers/clocksource/timer-starfive.h
index a7fadfa..7315a0f 100755 (executable)
--- a/drivers/clocksource/timer-starfive.h
+++ b/drivers/clocksource/timer-starfive.h
@@ -84,7 +84,6 @@ struct starfive_timer {
 struct starfive_clkevt {
        struct clock_event_device evt;
        struct clk *clk;
-       struct reset_control *rst;
        char name[20];
        int irq;
        u64 periodic;