diff options
| author | Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> | 2016-11-14 12:13:48 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2016-11-29 09:14:49 +0000 |
| commit | 2120a43527f3bd0efba0e893799acdd1486c2d1b (patch) | |
| tree | 7de845cc58bb20e8e91b61d6c9f660c2bdc90c95 /arch/microblaze | |
| parent | 591db74bfad475c2623f6e0d47307cf726a64375 (diff) | |
| download | linux-2120a43527f3bd0efba0e893799acdd1486c2d1b.tar.gz linux-2120a43527f3bd0efba0e893799acdd1486c2d1b.tar.bz2 linux-2120a43527f3bd0efba0e893799acdd1486c2d1b.zip | |
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: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/include/asm/irq.h | 2 | ||||
| -rw-r--r-- | arch/microblaze/kernel/irq.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/microblaze/include/asm/irq.h b/arch/microblaze/include/asm/irq.h index bab3b1393ad4..d785defeeed5 100644 --- a/arch/microblaze/include/asm/irq.h +++ b/arch/microblaze/include/asm/irq.h @@ -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 */ diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c index 11e24de91aa4..903dad822fad 100644 --- a/arch/microblaze/kernel/irq.c +++ b/arch/microblaze/kernel/irq.c @@ -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; |