enetc: Migrate to PHYLINK and PCS_LYNX

[linux.git] / drivers / clocksource / timer-pxa.c

diff --git a/drivers/clocksource/timer-pxa.c b/drivers/clocksource/timer-pxa.c
index 913a5d354a1ff8ff28bb9d26f748df2e3d90cb6b..7ad0e5adb2ffac4125c34710fc67f4b45f30331d 100644 (file)
--- a/drivers/clocksource/timer-pxa.c
+++ b/drivers/clocksource/timer-pxa.c
@@ -143,13 +143,6 @@ static struct clock_event_device ckevt_pxa_osmr0 = {
        .resume                 = pxa_timer_resume,
 };
 
-static struct irqaction pxa_ost0_irq = {
-       .name           = "ost0",
-       .flags          = IRQF_TIMER | IRQF_IRQPOLL,
-       .handler        = pxa_ost0_interrupt,
-       .dev_id         = &ckevt_pxa_osmr0,
-};
-
 static int __init pxa_timer_common_init(int irq, unsigned long clock_tick_rate)
 {
        int ret;
@@ -161,7 +154,8 @@ static int __init pxa_timer_common_init(int irq, unsigned long clock_tick_rate)
 
        ckevt_pxa_osmr0.cpumask = cpumask_of(0);
 
-       ret = setup_irq(irq, &pxa_ost0_irq);
+       ret = request_irq(irq, pxa_ost0_interrupt, IRQF_TIMER | IRQF_IRQPOLL,
+                         "ost0", &ckevt_pxa_osmr0);
        if (ret) {
                pr_err("Failed to setup irq\n");
                return ret;