Skip to content

Commit

Permalink
irq: csky: perform irqentry in entry code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Rutland committed Oct 26, 2021
1 parent 26dc129 commit 2872329
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion arch/csky/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/csky/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ ENTRY(csky_irq)


mov a0, sp
jbsr csky_do_IRQ
jbsr generic_handle_arch_irq

jmpi ret_from_exception

Expand Down
5 changes: 0 additions & 5 deletions arch/csky/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

0 comments on commit 2872329

Please sign in to comment.