diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2021-10-20 11:00:46 +0100 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2021-10-26 10:13:27 +0100 |
| commit | 287232987f0ebb29f68cfab13625017bbfb38adc (patch) | |
| tree | 95bd84e133a06b50478b2eccbc0dcd9ccd2d2408 /arch/csky | |
| parent | 26dc129342cfc1e09dcf8473331efcf419a471af (diff) | |
irq: csky: perform irqentry in entry code
In preparation for removing HANDLE_DOMAIN_IRQ_IRQENTRY, have arch/csky
perform all the irqentry accounting in its entry code. As arch/csky uses
GENERIC_IRQ_MULTI_HANDLER, we can use generic_handle_arch_irq() to do
so.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Guo Ren <guoren@kernel.org>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/csky')
| -rw-r--r-- | arch/csky/Kconfig | 1 | ||||
| -rw-r--r-- | arch/csky/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/csky/kernel/irq.c | 5 |
3 files changed, 1 insertions, 7 deletions
diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig index 45f03f674a61..9d4d898df76b 100644 --- a/arch/csky/Kconfig +++ b/arch/csky/Kconfig @@ -18,7 +18,6 @@ config CSKY select DMA_DIRECT_REMAP select IRQ_DOMAIN select HANDLE_DOMAIN_IRQ - select HANDLE_DOMAIN_IRQ_IRQENTRY select DW_APB_TIMER_OF select GENERIC_IOREMAP select GENERIC_LIB_ASHLDI3 diff --git a/arch/csky/kernel/entry.S b/arch/csky/kernel/entry.S index 00e3c8ebf9b8..a4ababf25e24 100644 --- a/arch/csky/kernel/entry.S +++ b/arch/csky/kernel/entry.S @@ -249,7 +249,7 @@ ENTRY(csky_irq) mov a0, sp - jbsr csky_do_IRQ + jbsr generic_handle_arch_irq jmpi ret_from_exception diff --git a/arch/csky/kernel/irq.c b/arch/csky/kernel/irq.c index 03a1930f1cbb..fcdaf3156286 100644 --- a/arch/csky/kernel/irq.c +++ b/arch/csky/kernel/irq.c @@ -15,8 +15,3 @@ void __init init_IRQ(void) setup_smp_ipi(); #endif } - -asmlinkage void __irq_entry csky_do_IRQ(struct pt_regs *regs) -{ - handle_arch_irq(regs); -} |