Commit 418360b2 authored by Mark Rutland's avatar Mark Rutland
Browse files

irq: openrisc: perform irqentry in entry code 



In preparation for removing HANDLE_DOMAIN_IRQ_IRQENTRY, have
arch/openrisc perform all the irqentry accounting in its entry code. As
arch/openrisc 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: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarStafford Horne <shorne@gmail.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Thomas Gleixner <tglx@linutronix.de>
parent 28723298

arch/openrisc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ config OPENRISC 
	select OF_EARLY_FLATTREE

	select IRQ_DOMAIN

	select HANDLE_DOMAIN_IRQ

	select HANDLE_DOMAIN_IRQ_IRQENTRY

	select GPIOLIB

	select HAVE_ARCH_TRACEHOOK

	select SPARSE_IRQ

arch/openrisc/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -569,8 +569,8 @@ EXCEPTION_ENTRY(_external_irq_handler) 
#endif

	CLEAR_LWA_FLAG(r3)

	l.addi	r3,r1,0

	l.movhi	r8,hi(do_IRQ)

	l.ori	r8,r8,lo(do_IRQ)

	l.movhi	r8,hi(generic_handle_arch_irq)

	l.ori	r8,r8,lo(generic_handle_arch_irq)

	l.jalr r8

	l.nop

	l.j    _ret_from_intr

arch/openrisc/kernel/irq.c

+0 −5
Original line number Diff line number Diff line
@@ -36,8 +36,3 @@ void __init init_IRQ(void) 
{

	irqchip_init();

}
 


void __irq_entry do_IRQ(struct pt_regs *regs)

{

	handle_arch_irq(regs);

}