return IRQ_HANDLED;
 }
 
-static struct irqaction sibyte_irqaction = {
-       .handler        = sibyte_counter_handler,
-       .flags          = IRQF_DISABLED | IRQF_PERCPU,
-       .name           = "timer",
-};
-
 static DEFINE_PER_CPU(struct clock_event_device, sibyte_hpt_clockevent);
 static DEFINE_PER_CPU(struct irqaction, sibyte_hpt_irqaction);
 static DEFINE_PER_CPU(char [18], sibyte_hpt_name);
        action->flags   = IRQF_DISABLED | IRQF_PERCPU;
        action->name    = name;
        action->dev_id  = cd;
-       setup_irq(irq, &sibyte_irqaction);
+       setup_irq(irq, &action);
 }
 
 /*