MIPS: Move IP30 timer to request_percpu_irq()

Teach the SGI IP30 timer about request_percpu_irq(), which ultimately will
allow for the removal of the antiquated setup_percpu_irq() API.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://patch.msgid.link/20251210082242.360936-4-maz@kernel.org

diff --git a/arch/mips/include/asm/cevt-r4k.h b/arch/mips/include/asm/cevt-r4k.h
index 2e13a038d2600d74ca45b70b098314cf891a96b4..5229eb34f28a4cd97ae30bbb5fc1eaf679de8f0c 100644 (file)
--- a/arch/mips/include/asm/cevt-r4k.h
+++ b/arch/mips/include/asm/cevt-r4k.h
@@ -23,7 +23,6 @@ void mips_event_handler(struct clock_event_device *dev);
 int c0_compare_int_usable(void);
 irqreturn_t c0_compare_interrupt(int, void *);
 
-extern struct irqaction c0_compare_irqaction;
 extern int cp0_timer_irq_installed;
 
 #endif /* __ASM_CEVT_R4K_H */

diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
index 5f6e9e2ebbdbb805b37a2f7deef744e7bc3bb123..f58325f9bd2bcd5d803d5e05a1d8138cc054dc49 100644 (file)
--- a/arch/mips/kernel/cevt-r4k.c
+++ b/arch/mips/kernel/cevt-r4k.c
@@ -159,17 +159,6 @@ irqreturn_t c0_compare_interrupt(int irq, void *dev_id)
        return IRQ_NONE;
 }
 
-struct irqaction c0_compare_irqaction = {
-       .handler = c0_compare_interrupt,
-       /*
-        * IRQF_SHARED: The timer interrupt may be shared with other interrupts
-        * such as perf counter and FDC interrupts.
-        */
-       .flags = IRQF_PERCPU | IRQF_TIMER | IRQF_SHARED,
-       .name = "timer",
-};
-
-
 void mips_event_handler(struct clock_event_device *dev)
 {
 }

diff --git a/arch/mips/sgi-ip30/ip30-timer.c b/arch/mips/sgi-ip30/ip30-timer.c
index 7652f72f0daf6d12e4438eebfd3cc8669400296c..294e1f7e6d8a64fc8a7d19afa0ad9e80058493ff 100644 (file)
--- a/arch/mips/sgi-ip30/ip30-timer.c
+++ b/arch/mips/sgi-ip30/ip30-timer.c
@@ -52,11 +52,10 @@ void __init plat_time_init(void)
        int irq = get_c0_compare_int();
 
        cp0_timer_irq_installed = 1;
-       c0_compare_irqaction.percpu_dev_id = &mips_clockevent_device;
-       c0_compare_irqaction.flags &= ~IRQF_SHARED;
        irq_set_handler(irq, handle_percpu_devid_irq);
        irq_set_percpu_devid(irq);
-       setup_percpu_irq(irq, &c0_compare_irqaction);
+       WARN_ON(request_percpu_irq(irq, c0_compare_interrupt,
+                                  "timer", &mips_clockevent_device));
        enable_percpu_irq(irq, IRQ_TYPE_NONE);
 
        ip30_heart_clocksource_init();