p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM: at91: PIT: Use consistent exit path in probe 

The current probe code is, whenever it fails to retrieve a resource, either
panicing, silently returning, or returning and displaying an error.

Make the code consistent by always panicing whenever it fails to grab any
resource.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Maxime Ripard 2014-07-01 11:33:20 +02:00 committed by Nicolas Ferre
parent bc1aeaeb75
commit a981b29f02
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/mach-at91/at91sam926x_time.c
View File

@ -208,7 +208,7 @@ static void __init at91sam926x_pit_common_init(void)
/* Set up irq handler */
ret = setup_irq(at91sam926x_pit_irq.irq, &at91sam926x_pit_irq);
if (ret)
pr_crit("AT91: PIT: Unable to setup IRQ\n");
panic("AT91: PIT: Unable to setup IRQ\n");
/* Set up and register clockevents */
pit_clkevt.mult = div_sc(pit_rate, NSEC_PER_SEC, pit_clkevt.shift);
@ -222,7 +222,7 @@ static void __init at91sam926x_pit_dt_init(struct device_node *node)
pit_base_addr = of_iomap(node, 0);
if (!pit_base_addr)
return;
panic("AT91: PIT: Could not map PIT address\n");
mck = of_clk_get(node, 0);
if (IS_ERR(mck))
@ -234,18 +234,12 @@ static void __init at91sam926x_pit_dt_init(struct device_node *node)
/* Get the interrupts property */
irq = irq_of_parse_and_map(node, 0);
if (!irq) {
pr_crit("AT91: PIT: Unable to get IRQ from DT\n");
goto clk_err;
}
if (!irq)
panic("AT91: PIT: Unable to get IRQ from DT\n");
at91sam926x_pit_irq.irq = irq;
at91sam926x_pit_common_init();
clk_err:
clk_put(mck);
iounmap(pit_base_addr);
}
CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
at91sam926x_pit_dt_init);