aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShinya Kuribayashi <skuribay@ruby.dti.ne.jp>2008-10-23 12:31:43 -0400
committerRalf Baechle <ralf@linux-mips.org>2008-10-27 12:18:30 -0400
commit68ed1ca9120506b2a0f80e4542deea24f89081ab (patch)
treea43ba9226b7d1a15165c0243cb673b327c84137e
parent9b6c04bc9726edf2655dd69d2e40c0ae4f07e525 (diff)
MIPS: EMMA2RH: Remove emma2rh_sw_irq_base
Let's use immediate value, instead. This also saves memory footprint, and probably a little bit faster. Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/emma/markeins/irq.c4
-rw-r--r--arch/mips/emma/markeins/irq_markeins.c14
2 files changed, 8 insertions, 10 deletions
diff --git a/arch/mips/emma/markeins/irq.c b/arch/mips/emma/markeins/irq.c
index 86b9b6a34f47..c0f9d46c69fd 100644
--- a/arch/mips/emma/markeins/irq.c
+++ b/arch/mips/emma/markeins/irq.c
@@ -53,7 +53,7 @@
53 * 53 *
54 */ 54 */
55 55
56extern void emma2rh_sw_irq_init(u32 base); 56extern void emma2rh_sw_irq_init(void);
57extern void emma2rh_gpio_irq_init(u32 base); 57extern void emma2rh_gpio_irq_init(u32 base);
58extern void emma2rh_irq_init(void); 58extern void emma2rh_irq_init(void);
59extern void emma2rh_irq_dispatch(void); 59extern void emma2rh_irq_dispatch(void);
@@ -103,7 +103,7 @@ void __init arch_init_irq(void)
103 103
104 /* init all controllers */ 104 /* init all controllers */
105 emma2rh_irq_init(); 105 emma2rh_irq_init();
106 emma2rh_sw_irq_init(EMMA2RH_SW_IRQ_BASE); 106 emma2rh_sw_irq_init();
107 emma2rh_gpio_irq_init(EMMA2RH_GPIO_IRQ_BASE); 107 emma2rh_gpio_irq_init(EMMA2RH_GPIO_IRQ_BASE);
108 mips_cpu_irq_init(); 108 mips_cpu_irq_init();
109 109
diff --git a/arch/mips/emma/markeins/irq_markeins.c b/arch/mips/emma/markeins/irq_markeins.c
index bbe0d711f00f..18834216d6fa 100644
--- a/arch/mips/emma/markeins/irq_markeins.c
+++ b/arch/mips/emma/markeins/irq_markeins.c
@@ -30,7 +30,6 @@
30#include <asm/debug.h> 30#include <asm/debug.h>
31#include <asm/emma/emma2rh.h> 31#include <asm/emma/emma2rh.h>
32 32
33static int emma2rh_sw_irq_base = -1;
34static int emma2rh_gpio_irq_base = -1; 33static int emma2rh_gpio_irq_base = -1;
35 34
36void ll_emma2rh_sw_irq_enable(int reg); 35void ll_emma2rh_sw_irq_enable(int reg);
@@ -40,12 +39,12 @@ void ll_emma2rh_gpio_irq_disable(int reg);
40 39
41static void emma2rh_sw_irq_enable(unsigned int irq) 40static void emma2rh_sw_irq_enable(unsigned int irq)
42{ 41{
43 ll_emma2rh_sw_irq_enable(irq - emma2rh_sw_irq_base); 42 ll_emma2rh_sw_irq_enable(irq - EMMA2RH_SW_IRQ_BASE);
44} 43}
45 44
46static void emma2rh_sw_irq_disable(unsigned int irq) 45static void emma2rh_sw_irq_disable(unsigned int irq)
47{ 46{
48 ll_emma2rh_sw_irq_disable(irq - emma2rh_sw_irq_base); 47 ll_emma2rh_sw_irq_disable(irq - EMMA2RH_SW_IRQ_BASE);
49} 48}
50 49
51struct irq_chip emma2rh_sw_irq_controller = { 50struct irq_chip emma2rh_sw_irq_controller = {
@@ -56,15 +55,14 @@ struct irq_chip emma2rh_sw_irq_controller = {
56 .unmask = emma2rh_sw_irq_enable, 55 .unmask = emma2rh_sw_irq_enable,
57}; 56};
58 57
59void emma2rh_sw_irq_init(u32 irq_base) 58void emma2rh_sw_irq_init(void)
60{ 59{
61 u32 i; 60 u32 i;
62 61
63 for (i = irq_base; i < irq_base + NUM_EMMA2RH_IRQ_SW; i++) 62 for (i = 0; i < NUM_EMMA2RH_IRQ_SW; i++)
64 set_irq_chip_and_handler(i, &emma2rh_sw_irq_controller, 63 set_irq_chip_and_handler(EMMA2RH_SW_IRQ_BASE + i,
64 &emma2rh_sw_irq_controller,
65 handle_level_irq); 65 handle_level_irq);
66
67 emma2rh_sw_irq_base = irq_base;
68} 66}
69 67
70void ll_emma2rh_sw_irq_enable(int irq) 68void ll_emma2rh_sw_irq_enable(int irq)