Skip to content

Commit

Permalink
clocksource/drivers/h8300: Initializer cleanup.
Browse files Browse the repository at this point in the history
Signed-off-by: Yoshinori Sato <[email protected]>
Signed-off-by: Daniel Lezcano <[email protected]>
  • Loading branch information
ysat0 authored and dlezcano committed Dec 16, 2015
1 parent f37632d commit 6f2b611
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions drivers/clocksource/h8300_timer8.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ struct timer8_priv {
void __iomem *mapbase;
unsigned long flags;
unsigned int rate;
unsigned int tcora;
};

static irqreturn_t timer8_interrupt(int irq, void *dev_id)
Expand Down Expand Up @@ -163,8 +162,6 @@ static void __init h8300_8timer_init(struct device_node *node)
{
void __iomem *base;
int irq;
int ret = 0;
int rate;
struct clk *clk;

clk = of_clk_get(node, 0);
Expand All @@ -187,20 +184,20 @@ static void __init h8300_8timer_init(struct device_node *node)

timer8_priv.mapbase = base;

rate = clk_get_rate(clk) / SCALE;
if (!rate) {
timer8_priv.rate = clk_get_rate(clk) / SCALE;
if (!timer8_priv.rate) {
pr_err("Failed to get rate for the clocksource\n");
goto unmap_reg;
}

ret = request_irq(irq, timer8_interrupt,
IRQF_TIMER, timer8_priv.ced.name, &timer8_priv);
if (ret < 0) {
if (request_irq(irq, timer8_interrupt, IRQF_TIMER,
timer8_priv.ced.name, &timer8_priv) < 0) {
pr_err("failed to request irq %d for clockevent\n", irq);
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;
unmap_reg:
Expand Down

0 comments on commit 6f2b611

Please sign in to comment.