Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2120a435 authored by Zubair Lutfullah Kakakhel's avatar Zubair Lutfullah Kakakhel Committed by Marc Zyngier
Browse files

irqchip/xilinx: Rename get_irq to xintc_get_irq 



Now that the driver is generic and used by multiple archs,
get_irq is too generic.

Rename get_irq to xintc_get_irq to avoid any conflicts

Acked-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 591db74b

arch/microblaze/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ struct pt_regs; 
extern void do_IRQ(struct pt_regs *regs);



/* should be defined in each interrupt controller driver */

extern unsigned int get_irq(void);

extern unsigned int xintc_get_irq(void);



#endif /* _ASM_MICROBLAZE_IRQ_H */

arch/microblaze/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ void __irq_entry do_IRQ(struct pt_regs *regs) 
	trace_hardirqs_off();



	irq_enter();

	irq = get_irq();

	irq = xintc_get_irq();

next_irq:

	BUG_ON(!irq);

	generic_handle_irq(irq);



	irq = get_irq();

	irq = xintc_get_irq();

	if (irq != -1U) {

		pr_debug("next irq: %d\n", irq);

		++concurrent_irq;

drivers/irqchip/irq-xilinx-intc.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static struct irq_chip intc_dev = { 
	.irq_mask_ack = intc_mask_ack,

};



unsigned int get_irq(void)

unsigned int xintc_get_irq(void)

{

	unsigned int hwirq, irq = -1;