From: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
To: monstr@monstr.eu, ralf@linux-mips.org, tglx@linutronix.de,
jason@lakedaemon.net, marc.zyngier@arm.com,
alistair@popple.id.au, mporter@kernel.crashing.org
Cc: soren.brinkmann@xilinx.com, linux-kernel@vger.kernel.org,
linux-mips@linux-mips.org, michal.simek@xilinx.com,
linuxppc-dev@lists.ozlabs.org, mpe@ellerman.id.au,
paulus@samba.org, benh@kernel.crashing.org
Subject: [Patch v5 03/12] irqchip: xilinx: Rename get_irq to xintc_get_irq
Date: Mon, 17 Oct 2016 17:52:47 +0100 [thread overview]
Message-ID: <1476723176-39891-4-git-send-email-Zubair.Kakakhel@imgtec.com> (raw)
Message-ID: <20161017165247.lnvZnx2GLcbQxX0z-7TzHM1WoR8xufJycq1uNzyf4r0@z> (raw)
In-Reply-To: <1476723176-39891-1-git-send-email-Zubair.Kakakhel@imgtec.com>
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@imgtec.com>
---
V4 -> V5
Rebased to v4.9-rc1
Use __func__ in pr_err
V3 -> V4
New patch.
---
arch/microblaze/include/asm/irq.h | 2 +-
arch/microblaze/kernel/irq.c | 4 ++--
drivers/irqchip/irq-xilinx-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 @@
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-xilinx-intc.c b/drivers/irqchip/irq-xilinx-intc.c
index fe533e1..45e5154 100644
--- a/drivers/irqchip/irq-xilinx-intc.c
+++ b/drivers/irqchip/irq-xilinx-intc.c
@@ -119,7 +119,7 @@ static void intc_mask_ack(struct irq_data *d)
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("%s: hwirq=%d, irq=%d\n", __func__, hwirq, irq);
return irq;
}
--
1.9.1
next prev parent reply other threads:[~2016-10-17 16:53 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-17 16:52 [Patch v5 00/12] microblaze/MIPS/PowerPC: Xilinx intc Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` [Patch v5 01/12] microblaze: irqchip: Move intc driver to irqchip Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` [Patch v5 02/12] irqchip: xilinx: Clean up irqdomain argument and read/write Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel [this message]
2016-10-17 16:52 ` [Patch v5 03/12] irqchip: xilinx: Rename get_irq to xintc_get_irq Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` [Patch v5 04/12] irqchip: xilinx: Add support for parent intc Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
2016-10-21 9:48 ` Marc Zyngier
2016-10-25 9:42 ` Zubair Lutfullah Kakakhel
2016-10-25 9:42 ` Zubair Lutfullah Kakakhel
2016-10-25 10:49 ` Thomas Gleixner
2016-10-25 14:44 ` Sören Brinkmann
2016-10-25 14:44 ` Sören Brinkmann
2016-10-25 14:52 ` Marc Zyngier
2016-10-17 16:52 ` [Patch v5 05/12] irqchip: xilinx: Try to fall back if xlnx,kind-of-intr not provided Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` [Patch v5 06/12] powerpc/virtex: Use generic xilinx irqchip driver Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
2016-10-19 11:53 ` Michael Ellerman
2016-10-17 16:52 ` [Patch v5 07/12] MIPS: xilfpga: Use irqchip instead of the legacy way Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` [Patch v5 08/12] MIPS: xilfpga: Use Xilinx Interrupt Controller Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` [Patch v5 09/12] MIPS: xilfpga: Update DT node and specify uart irq Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` [Patch v5 10/12] MIPS: xilfpga: Add DT node for AXI I2C Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` [Patch v5 11/12] MIPS: xilfpga: Add DT node for AXI emaclite Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` [Patch v5 12/12] MIPS: xilfpga: Update defconfig Zubair Lutfullah Kakakhel
2016-10-17 16:52 ` Zubair Lutfullah Kakakhel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476723176-39891-4-git-send-email-Zubair.Kakakhel@imgtec.com \
--to=zubair.kakakhel@imgtec.com \
--cc=alistair@popple.id.au \
--cc=benh@kernel.crashing.org \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=marc.zyngier@arm.com \
--cc=michal.simek@xilinx.com \
--cc=monstr@monstr.eu \
--cc=mpe@ellerman.id.au \
--cc=mporter@kernel.crashing.org \
--cc=paulus@samba.org \
--cc=ralf@linux-mips.org \
--cc=soren.brinkmann@xilinx.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).