clocksource: Replace setup_irq() by request_irq()

[linux.git] / drivers / clocksource / timer-integrator-ap.c

diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c
index c90a69c7b5fa575f1f73d49cb730f274545a8a9f..b0fcbaac58b0d96d62f2bc06a88972a0d7f14303 100644 (file)
--- a/drivers/clocksource/timer-integrator-ap.c
+++ b/drivers/clocksource/timer-integrator-ap.c
@@ -123,13 +123,6 @@ static struct clock_event_device integrator_clockevent = {
        .rating                 = 300,
 };
 
-static struct irqaction integrator_timer_irq = {
-       .name           = "timer",
-       .flags          = IRQF_TIMER | IRQF_IRQPOLL,
-       .handler        = integrator_timer_interrupt,
-       .dev_id         = &integrator_clockevent,
-};
-
 static int integrator_clockevent_init(unsigned long inrate,
                                      void __iomem *base, int irq)
 {
@@ -149,7 +142,9 @@ static int integrator_clockevent_init(unsigned long inrate,
        timer_reload = rate / HZ;
        writel(ctrl, clkevt_base + TIMER_CTRL);
 
-       ret = setup_irq(irq, &integrator_timer_irq);
+       ret = request_irq(irq, integrator_timer_interrupt,
+                         IRQF_TIMER | IRQF_IRQPOLL, "timer",
+                         &integrator_clockevent);
        if (ret)
                return ret;