[PATCH 08/13] AT91: PIT: use request_irq instead of setup_irq
Maxime Ripard
maxime.ripard at free-electrons.com
Wed Jun 25 06:06:40 PDT 2014
We can use the generic request_irq now to register a timer interrupt handler,
instead of the more complex setup_irq.
Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
---
arch/arm/mach-at91/at91sam926x_time.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c
index 5423894bb0fc..9678ac391a81 100644
--- a/arch/arm/mach-at91/at91sam926x_time.c
+++ b/arch/arm/mach-at91/at91sam926x_time.c
@@ -173,16 +173,10 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id)
return IRQ_NONE;
}
-static struct irqaction at91sam926x_pit_irq = {
- .name = "at91_tick",
- .flags = IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
- .handler = at91sam926x_pit_interrupt,
-};
-
/*
* Set up both clocksource and clockevent support.
*/
-static void __init at91sam926x_pit_common_init(void)
+static void __init at91sam926x_pit_common_init(unsigned int pit_irq)
{
unsigned long pit_rate;
unsigned bits;
@@ -208,7 +202,9 @@ static void __init at91sam926x_pit_common_init(void)
clocksource_register_hz(&pit_clk, pit_rate);
/* Set up irq handler */
- ret = setup_irq(at91sam926x_pit_irq.irq, &at91sam926x_pit_irq);
+ ret = request_irq(pit_irq, at91sam926x_pit_interrupt,
+ IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
+ "at91_tick", pit_base_addr);
if (ret)
panic(pr_fmt("Unable to setup IRQ\n"));
@@ -239,9 +235,7 @@ static void __init at91sam926x_pit_dt_init(struct device_node *node)
if (!irq)
panic(pr_fmt("Unable to get IRQ from DT\n"));
- at91sam926x_pit_irq.irq = irq;
-
- at91sam926x_pit_common_init();
+ at91sam926x_pit_common_init(irq);
}
CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
at91sam926x_pit_dt_init);
@@ -252,9 +246,7 @@ void __init at91sam926x_pit_init(void)
if (IS_ERR(mck))
panic(pr_fmt("Unable to get mck clk\n"));
- at91sam926x_pit_irq.irq = NR_IRQS_LEGACY + AT91_ID_SYS;
-
- at91sam926x_pit_common_init();
+ at91sam926x_pit_common_init(NR_IRQS_LEGACY + AT91_ID_SYS);
}
void __init at91sam926x_ioremap_pit(u32 addr)
--
2.0.0
More information about the linux-arm-kernel
mailing list