Commit 6f2b611d authored by Yoshinori Sato's avatar Yoshinori Sato Committed by Daniel Lezcano

clocksource/drivers/h8300: Initializer cleanup.

Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent f37632d1
...@@ -33,7 +33,6 @@ struct timer8_priv { ...@@ -33,7 +33,6 @@ struct timer8_priv {
void __iomem *mapbase; void __iomem *mapbase;
unsigned long flags; unsigned long flags;
unsigned int rate; unsigned int rate;
unsigned int tcora;
}; };
static irqreturn_t timer8_interrupt(int irq, void *dev_id) static irqreturn_t timer8_interrupt(int irq, void *dev_id)
...@@ -163,8 +162,6 @@ static void __init h8300_8timer_init(struct device_node *node) ...@@ -163,8 +162,6 @@ static void __init h8300_8timer_init(struct device_node *node)
{ {
void __iomem *base; void __iomem *base;
int irq; int irq;
int ret = 0;
int rate;
struct clk *clk; struct clk *clk;
clk = of_clk_get(node, 0); clk = of_clk_get(node, 0);
...@@ -187,20 +184,20 @@ static void __init h8300_8timer_init(struct device_node *node) ...@@ -187,20 +184,20 @@ static void __init h8300_8timer_init(struct device_node *node)
timer8_priv.mapbase = base; timer8_priv.mapbase = base;
rate = clk_get_rate(clk) / SCALE; timer8_priv.rate = clk_get_rate(clk) / SCALE;
if (!rate) { if (!timer8_priv.rate) {
pr_err("Failed to get rate for the clocksource\n"); pr_err("Failed to get rate for the clocksource\n");
goto unmap_reg; goto unmap_reg;
} }
ret = request_irq(irq, timer8_interrupt, if (request_irq(irq, timer8_interrupt, IRQF_TIMER,
IRQF_TIMER, timer8_priv.ced.name, &timer8_priv); timer8_priv.ced.name, &timer8_priv) < 0) {
if (ret < 0) {
pr_err("failed to request irq %d for clockevent\n", irq); pr_err("failed to request irq %d for clockevent\n", irq);
goto unmap_reg; goto unmap_reg;
} }
clockevents_config_and_register(&timer8_priv.ced, rate, 1, 0x0000ffff); clockevents_config_and_register(&timer8_priv.ced,
timer8_priv.rate, 1, 0x0000ffff);
return; return;
unmap_reg: unmap_reg:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment