diff mbox

[RFT,v2,22/48] blackfin, irq: Prepare for killing the first parameter 'irq' of irq_flow_handler_t

Message ID 1433391238-19471-23-git-send-email-jiang.liu@linux.intel.com
State Not Applicable
Headers show

Commit Message

Jiang Liu June 4, 2015, 4:13 a.m. UTC 
Change irq flow handler to prepare for killing the first parameter 'irq'
of irq_flow_handler_t.

Seems ipipe.c is never used at all, and it may fail to compile if it's
used.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
 arch/blackfin/kernel/ipipe.c              |    2 +-
 arch/blackfin/mach-common/ints-priority.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/arch/blackfin/kernel/ipipe.c b/arch/blackfin/kernel/ipipe.c
index f657b38163e3..6007a1375c5b 100644
--- a/arch/blackfin/kernel/ipipe.c
+++ b/arch/blackfin/kernel/ipipe.c
@@ -56,7 +56,7 @@  EXPORT_SYMBOL(__ipipe_irq_lvmask);
 
 static void __ipipe_ack_irq(unsigned irq, struct irq_desc *desc)
 {
-	desc->ipipe_ack(irq, desc);
+	desc->ipipe_ack(irq_desc_get_irq(desc), desc);
 }
 
 /*
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 332a434b4669..4e3155e5aa20 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -830,7 +830,7 @@  void bfin_demux_gpio_irq(unsigned int inta_irq,
 {
 	unsigned int irq;
 
-	switch (inta_irq) {
+	switch (irq_desc_get_irq(desc)) {
 #if defined(BF537_FAMILY)
 	case IRQ_PF_INTA_PG_INTA:
 		bfin_demux_gpio_block(IRQ_PF0);