Skip to content

Commit a1eaca4

Browse files
Marc ZyngierKAGA-KOKO
authored andcommitted
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
1 parent e9b624e commit a1eaca4

3 files changed

Lines changed: 2 additions & 15 deletions

File tree

arch/mips/include/asm/cevt-r4k.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ void mips_event_handler(struct clock_event_device *dev);
2323
int c0_compare_int_usable(void);
2424
irqreturn_t c0_compare_interrupt(int, void *);
2525

26-
extern struct irqaction c0_compare_irqaction;
2726
extern int cp0_timer_irq_installed;
2827

2928
#endif /* __ASM_CEVT_R4K_H */

arch/mips/kernel/cevt-r4k.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,6 @@ irqreturn_t c0_compare_interrupt(int irq, void *dev_id)
159159
return IRQ_NONE;
160160
}
161161

162-
struct irqaction c0_compare_irqaction = {
163-
.handler = c0_compare_interrupt,
164-
/*
165-
* IRQF_SHARED: The timer interrupt may be shared with other interrupts
166-
* such as perf counter and FDC interrupts.
167-
*/
168-
.flags = IRQF_PERCPU | IRQF_TIMER | IRQF_SHARED,
169-
.name = "timer",
170-
};
171-
172-
173162
void mips_event_handler(struct clock_event_device *dev)
174163
{
175164
}

arch/mips/sgi-ip30/ip30-timer.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,10 @@ void __init plat_time_init(void)
5252
int irq = get_c0_compare_int();
5353

5454
cp0_timer_irq_installed = 1;
55-
c0_compare_irqaction.percpu_dev_id = &mips_clockevent_device;
56-
c0_compare_irqaction.flags &= ~IRQF_SHARED;
5755
irq_set_handler(irq, handle_percpu_devid_irq);
5856
irq_set_percpu_devid(irq);
59-
setup_percpu_irq(irq, &c0_compare_irqaction);
57+
WARN_ON(request_percpu_irq(irq, c0_compare_interrupt,
58+
"timer", &mips_clockevent_device));
6059
enable_percpu_irq(irq, IRQ_TYPE_NONE);
6160

6261
ip30_heart_clocksource_init();

0 commit comments

Comments
 (0)