---

yaml --- r: 117917 b: refs/heads/master c: 68ed1ca h: refs/heads/master i: 117915: acff00e v: v3
git-mirror · Oct 27, 2008 · 8450c37 · 8450c37
1 parent f0ad2c8
commit 8450c37
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b6c04bc9726edf2655dd69d2e40c0ae4f07e525
+refs/heads/master: 68ed1ca9120506b2a0f80e4542deea24f89081ab
diff --git a/trunk/arch/mips/emma/markeins/irq.c b/trunk/arch/mips/emma/markeins/irq.c
@@ -53,7 +53,7 @@
  *
  */
 
-extern void emma2rh_sw_irq_init(u32 base);
+extern void emma2rh_sw_irq_init(void);
 extern void emma2rh_gpio_irq_init(u32 base);
 extern void emma2rh_irq_init(void);
 extern void emma2rh_irq_dispatch(void);
@@ -103,7 +103,7 @@ void __init arch_init_irq(void)
 
 	/* init all controllers */
 	emma2rh_irq_init();
-	emma2rh_sw_irq_init(EMMA2RH_SW_IRQ_BASE);
+	emma2rh_sw_irq_init();
 	emma2rh_gpio_irq_init(EMMA2RH_GPIO_IRQ_BASE);
 	mips_cpu_irq_init();
 

diff --git a/trunk/arch/mips/emma/markeins/irq_markeins.c b/trunk/arch/mips/emma/markeins/irq_markeins.c
@@ -30,7 +30,6 @@
 #include <asm/debug.h>
 #include <asm/emma/emma2rh.h>
 
-static int emma2rh_sw_irq_base = -1;
 static int emma2rh_gpio_irq_base = -1;
 
 void ll_emma2rh_sw_irq_enable(int reg);
@@ -40,12 +39,12 @@ void ll_emma2rh_gpio_irq_disable(int reg);
 
 static void emma2rh_sw_irq_enable(unsigned int irq)
 {
-	ll_emma2rh_sw_irq_enable(irq - emma2rh_sw_irq_base);
+	ll_emma2rh_sw_irq_enable(irq - EMMA2RH_SW_IRQ_BASE);
 }
 
 static void emma2rh_sw_irq_disable(unsigned int irq)
 {
-	ll_emma2rh_sw_irq_disable(irq - emma2rh_sw_irq_base);
+	ll_emma2rh_sw_irq_disable(irq - EMMA2RH_SW_IRQ_BASE);
 }
 
 struct irq_chip emma2rh_sw_irq_controller = {
@@ -56,15 +55,14 @@ struct irq_chip emma2rh_sw_irq_controller = {
 	.unmask = emma2rh_sw_irq_enable,
 };
 
-void emma2rh_sw_irq_init(u32 irq_base)
+void emma2rh_sw_irq_init(void)
 {
 	u32 i;
 
-	for (i = irq_base; i < irq_base + NUM_EMMA2RH_IRQ_SW; i++)
-		set_irq_chip_and_handler(i, &emma2rh_sw_irq_controller,
+	for (i = 0; i < NUM_EMMA2RH_IRQ_SW; i++)
+		set_irq_chip_and_handler(EMMA2RH_SW_IRQ_BASE + i,
+					 &emma2rh_sw_irq_controller,
 					 handle_level_irq);
-
-	emma2rh_sw_irq_base = irq_base;
 }
 
 void ll_emma2rh_sw_irq_enable(int irq)