Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 07:50:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

irqchip/xilinx: Rename get_irq to xintc_get_irq

Browse Source 
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>
This commit is contained in:
Zubair Lutfullah Kakakhel 2016-11-14 12:13:48 +00:00 committed by Marc Zyngier
parent 591db74bfa
commit 2120a43527
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/microblaze/include/asm/irq.h
View File

@ -16,6 +16,6 @@ struct pt_regs;
extern void do_IRQ(struct pt_regs *regs); extern void do_IRQ(struct pt_regs *regs);
/* should be defined in each interrupt controller driver */ /* 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 */ #endif /* _ASM_MICROBLAZE_IRQ_H */

4
arch/microblaze/kernel/irq.c
View File

@ -29,12 +29,12 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
trace_hardirqs_off(); trace_hardirqs_off();
irq_enter(); irq_enter();
irq = get_irq(); irq = xintc_get_irq();
next_irq: next_irq:
BUG_ON(!irq); BUG_ON(!irq);
generic_handle_irq(irq); generic_handle_irq(irq);
irq = get_irq(); irq = xintc_get_irq();
if (irq != -1U) { if (irq != -1U) {
pr_debug("next irq: %d\n", irq); pr_debug("next irq: %d\n", irq);
++concurrent_irq; ++concurrent_irq;

2
drivers/irqchip/irq-xilinx-intc.c
View File

@ -101,7 +101,7 @@ static struct irq_chip intc_dev = {
.irq_mask_ack = intc_mask_ack, .irq_mask_ack = intc_mask_ack,
}; };
unsigned int get_irq(void) unsigned int xintc_get_irq(void)
{ {
unsigned int hwirq, irq = -1; unsigned int hwirq, irq = -1;