6 files changed, 56 insertions, 61 deletions

diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index 447759201d1d..bb31370cd390 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -52,14 +52,13 @@ static unsigned int startup_8259A_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type i8259A_irq_type = {
-        "XT-PIC",
-        startup_8259A_irq,
-        shutdown_8259A_irq,
-        enable_8259A_irq,
-        disable_8259A_irq,
-        mask_and_ack_8259A,
-        end_8259A_irq,
-        NULL
+        .typename = "XT-PIC",
+        .startup = startup_8259A_irq,
+        .shutdown = shutdown_8259A_irq,
+        .enable = enable_8259A_irq,
+        .disable = disable_8259A_irq,
+        .ack = mask_and_ack_8259A,
+        .end = end_8259A_irq,
 };
 
 /*
diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c
index 43c00ac0b88d..bf759e33c5ef 100644
--- a/arch/mips/kernel/irq-msc01.c
+++ b/arch/mips/kernel/irq-msc01.c
@@ -129,25 +129,23 @@ msc_bind_eic_interrupt (unsigned int irq, unsigned int set)
 #define shutdown_msc_irq        disable_msc_irq
 
 struct hw_interrupt_type msc_levelirq_type = {
-        "SOC-it-Level",
-        startup_msc_irq,
-        shutdown_msc_irq,
-        enable_msc_irq,
-        disable_msc_irq,
-        level_mask_and_ack_msc_irq,
-        end_msc_irq,
-        NULL
+        .typename = "SOC-it-Level",
+        .startup = startup_msc_irq,
+        .shutdown = shutdown_msc_irq,
+        .enable = enable_msc_irq,
+        .disable = disable_msc_irq,
+        .ack = level_mask_and_ack_msc_irq,
+        .end = end_msc_irq,
 };
 
 struct hw_interrupt_type msc_edgeirq_type = {
-        "SOC-it-Edge",
-        startup_msc_irq,
-        shutdown_msc_irq,
-        enable_msc_irq,
-        disable_msc_irq,
-        edge_mask_and_ack_msc_irq,
-        end_msc_irq,
-        NULL
+        .typename = "SOC-it-Edge",
+        .startup =startup_msc_irq,
+        .shutdown = shutdown_msc_irq,
+        .enable = enable_msc_irq,
+        .disable = disable_msc_irq,
+        .ack = edge_mask_and_ack_msc_irq,
+        .end = end_msc_irq,
 };
 
 
diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c
index 088bbbc869e6..0ac067f45cf5 100644
--- a/arch/mips/kernel/irq-mv6434x.c
+++ b/arch/mips/kernel/irq-mv6434x.c
@@ -135,14 +135,13 @@ void ll_mv64340_irq(struct pt_regs *regs)
 #define shutdown_mv64340_irq    disable_mv64340_irq
 
 struct hw_interrupt_type mv64340_irq_type = {
-        "MV-64340",
-        startup_mv64340_irq,
-        shutdown_mv64340_irq,
-        enable_mv64340_irq,
-        disable_mv64340_irq,
-        mask_and_ack_mv64340_irq,
-        end_mv64340_irq,
-        NULL
+        .typename = "MV-64340",
+        .startup = startup_mv64340_irq,
+        .shutdown = shutdown_mv64340_irq,
+        .enable = enable_mv64340_irq,
+        .disable = disable_mv64340_irq,
+        .ack = mask_and_ack_mv64340_irq,
+        .end = end_mv64340_irq,
 };
 
 void __init mv64340_irq_init(unsigned int base)
diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c
index f5d779fd0355..0b130c5ac5d9 100644
--- a/arch/mips/kernel/irq-rm7000.c
+++ b/arch/mips/kernel/irq-rm7000.c
@@ -72,13 +72,13 @@ static void rm7k_cpu_irq_end(unsigned int irq)
 }
 
 static hw_irq_controller rm7k_irq_controller = {
-        "RM7000",
-        rm7k_cpu_irq_startup,
-        rm7k_cpu_irq_shutdown,
-        rm7k_cpu_irq_enable,
-        rm7k_cpu_irq_disable,
-        rm7k_cpu_irq_ack,
-        rm7k_cpu_irq_end,
+        .typename = "RM7000",
+        .startup = rm7k_cpu_irq_startup,
+        .shutdown = rm7k_cpu_irq_shutdown,
+        .enable = rm7k_cpu_irq_enable,
+        .disable = rm7k_cpu_irq_disable,
+        .ack = rm7k_cpu_irq_ack,
+        .end = rm7k_cpu_irq_end,
 };
 
 void __init rm7k_cpu_irq_init(int base)
diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c
index bdd130296256..9b5f20c32acb 100644
--- a/arch/mips/kernel/irq-rm9000.c
+++ b/arch/mips/kernel/irq-rm9000.c
@@ -106,23 +106,23 @@ static void rm9k_cpu_irq_end(unsigned int irq)
 }
 
 static hw_irq_controller rm9k_irq_controller = {
-        "RM9000",
-        rm9k_cpu_irq_startup,
-        rm9k_cpu_irq_shutdown,
-        rm9k_cpu_irq_enable,
-        rm9k_cpu_irq_disable,
-        rm9k_cpu_irq_ack,
-        rm9k_cpu_irq_end,
+        .typename = "RM9000",
+        .startup = rm9k_cpu_irq_startup,
+        .shutdown = rm9k_cpu_irq_shutdown,
+        .enable = rm9k_cpu_irq_enable,
+        .disable = rm9k_cpu_irq_disable,
+        .ack = rm9k_cpu_irq_ack,
+        .end = rm9k_cpu_irq_end,
 };
 
 static hw_irq_controller rm9k_perfcounter_irq = {
-        "RM9000",
-        rm9k_perfcounter_irq_startup,
-        rm9k_perfcounter_irq_shutdown,
-        rm9k_cpu_irq_enable,
-        rm9k_cpu_irq_disable,
-        rm9k_cpu_irq_ack,
-        rm9k_cpu_irq_end,
+        .typename = "RM9000",
+        .startup = rm9k_perfcounter_irq_startup,
+        .shutdown = rm9k_perfcounter_irq_shutdown,
+        .enable = rm9k_cpu_irq_enable,
+        .disable = rm9k_cpu_irq_disable,
+        .ack = rm9k_cpu_irq_ack,
+        .end = rm9k_cpu_irq_end,
 };
 
 unsigned int rm9000_perfcount_irq;
diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
index 8f8c15fa748d..905ff843a68f 100644
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -93,14 +93,13 @@ static void mips_cpu_irq_end(unsigned int irq)
 }
 
 static hw_irq_controller mips_cpu_irq_controller = {
-        "MIPS",
-        mips_cpu_irq_startup,
-        mips_cpu_irq_shutdown,
-        mips_cpu_irq_enable,
-        mips_cpu_irq_disable,
-        mips_cpu_irq_ack,
-        mips_cpu_irq_end,
-        NULL                    /* no affinity stuff for UP */
+        .typename = "MIPS",
+        .startup = mips_cpu_irq_startup,
+        .shutdown = mips_cpu_irq_shutdown,
+        .enable = mips_cpu_irq_enable,
+        .disable = mips_cpu_irq_disable,
+        .ack = mips_cpu_irq_ack,
+        .end = mips_cpu_irq_end,
 };