return IRQ_HANDLED;
 }
 
-static struct irqaction cns3xxx_timer_irq = {
-       .name           = "timer",
-       .flags          = IRQF_TIMER | IRQF_IRQPOLL,
-       .handler        = cns3xxx_timer_interrupt,
-};
-
 /*
  * Set up the clock source and clock events devices
  */
        writel(val, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
 
        /* Make irqs happen for the system timer */
-       setup_irq(timer_irq, &cns3xxx_timer_irq);
+       if (request_irq(timer_irq, cns3xxx_timer_interrupt,
+                       IRQF_TIMER | IRQF_IRQPOLL, "timer", NULL))
+               pr_err("Failed to request irq %d (timer)\n", timer_irq);
 
        cns3xxx_clockevents_init(timer_irq);
 }