mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
clocksource/drivers/h8300: Initializer cleanup.
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
parent
f37632d1e9
commit
6f2b611db2
1 changed files with 6 additions and 9 deletions
|
@ -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)
|
||||
|
@ -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);
|
||||
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue