On 1.9.2016 18:50, Zubair Lutfullah Kakakhel wrote:
> 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
>
> Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@xxxxxxxxxx>
>
> ---
> V3 -> V4
> New patch.
> ---
> arch/microblaze/include/asm/irq.h | 2 +-
> arch/microblaze/kernel/irq.c | 4 ++--
> drivers/irqchip/irq-axi-intc.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/microblaze/include/asm/irq.h b/arch/microblaze/include/asm/irq.h
> index bab3b13..d785def 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 11e24de..903dad8 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;
> diff --git a/drivers/irqchip/irq-axi-intc.c b/drivers/irqchip/irq-axi-intc.c
> index 7ab0762..ac31548 100644
> --- a/drivers/irqchip/irq-axi-intc.c
> +++ b/drivers/irqchip/irq-axi-intc.c
> @@ -119,7 +119,7 @@ static struct irq_chip intc_dev = {
>
> static struct irq_domain *root_domain;
>
> -unsigned int get_irq(void)
> +unsigned int xintc_get_irq(void)
> {
> unsigned int hwirq, irq = -1;
>
> @@ -127,7 +127,7 @@ unsigned int get_irq(void)
> if (hwirq != -1U)
> irq = irq_find_mapping(root_domain, hwirq);
>
> - pr_debug("get_irq: hwirq=%d, irq=%d\n", hwirq, irq);
> + pr_debug("xintc_get_irq: hwirq=%d, irq=%d\n", hwirq, irq);
%s and __func__ instead.
Thanks,
Michal
