diff mbox

[03/32] irqchip: bcm2835: Avoid arch/arm-specific handle_IRQ.

Message ID 1464817421-8519-4-git-send-email-kraxel@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gerd Hoffmann June 1, 2016, 9:43 p.m. UTC 
From: Eric Anholt <eric@anholt.net>

This is equivalent and works for arm64 as well.

Signed-off-by: Eric Anholt <eric@anholt.net>
---
 drivers/irqchip/irq-bcm2835.c | 3 +--
 drivers/irqchip/irq-bcm2836.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

Comments

Jason Cooper June 2, 2016, 12:50 a.m. UTC | #1 
Hey Gerd,

On Wed, Jun 01, 2016 at 11:43:12PM +0200, Gerd Hoffmann wrote:
> From: Eric Anholt <eric@anholt.net>
> 
> This is equivalent and works for arm64 as well.
> 
> Signed-off-by: Eric Anholt <eric@anholt.net>
> ---

I don't mind taking this, or Eric's V2 resend.  However, the commit
message needs a rewrite.

thx,

Jason.
Eric Anholt June 2, 2016, 6:06 p.m. UTC | #2 
Jason Cooper <jason@lakedaemon.net> writes:

> Hey Gerd,
>
> On Wed, Jun 01, 2016 at 11:43:12PM +0200, Gerd Hoffmann wrote:
>> From: Eric Anholt <eric@anholt.net>
>> 
>> This is equivalent and works for arm64 as well.
>> 
>> Signed-off-by: Eric Anholt <eric@anholt.net>
>> ---
>
> I don't mind taking this, or Eric's V2 resend.  However, the commit
> message needs a rewrite.

Can you clarify what you don't like about it or suggest replacement
wording?  This is the first concern I've seen.
diff mbox

Patch

diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
index bf9cc5f..44d7c38 100644
--- a/drivers/irqchip/irq-bcm2835.c
+++ b/drivers/irqchip/irq-bcm2835.c
@@ -52,7 +52,6 @@ 
 #include <linux/irqdomain.h>
 
 #include <asm/exception.h>
-#include <asm/mach/irq.h>
 
 /* Put the bank and irq (32 bits) into the hwirq */
 #define MAKE_HWIRQ(b, n)	((b << 5) | (n))
@@ -242,7 +241,7 @@  static void __exception_irq_entry bcm2835_handle_irq(
 	u32 hwirq;
 
 	while ((hwirq = get_next_armctrl_hwirq()) != ~0)
-		handle_IRQ(irq_linear_revmap(intc.domain, hwirq), regs);
+		handle_domain_irq(intc.domain, hwirq, regs);
 }
 
 static void bcm2836_chained_handle_irq(struct irq_desc *desc)
diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
index 72ff1d5..2787598 100644
--- a/drivers/irqchip/irq-bcm2836.c
+++ b/drivers/irqchip/irq-bcm2836.c
@@ -180,7 +180,7 @@  __exception_irq_entry bcm2836_arm_irqchip_handle_irq(struct pt_regs *regs)
 	} else if (stat) {
 		u32 hwirq = ffs(stat) - 1;
 
-		handle_IRQ(irq_linear_revmap(intc.domain, hwirq), regs);
+		handle_domain_irq(intc.domain, hwirq, regs);
 	}
 }