20 files changed, 211 insertions, 237 deletions

diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index d1eb5a4a9a19..0b912f739feb 100644
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -253,47 +253,43 @@ void restore_local_and_enable(int controller, unsigned long mask)
 
 
 static struct hw_interrupt_type rise_edge_irq_type = {
-        "Au1000 Rise Edge",
-        startup_irq,
-        shutdown_irq,
-        local_enable_irq,
-        local_disable_irq,
-        mask_and_ack_rise_edge_irq,
-        end_irq,
-        NULL
+        .typename = "Au1000 Rise Edge",
+        .startup = startup_irq,
+        .shutdown = shutdown_irq,
+        .enable = local_enable_irq,
+        .disable = local_disable_irq,
+        .ack = mask_and_ack_rise_edge_irq,
+        .end = end_irq,
 };
 
 static struct hw_interrupt_type fall_edge_irq_type = {
-        "Au1000 Fall Edge",
-        startup_irq,
-        shutdown_irq,
-        local_enable_irq,
-        local_disable_irq,
-        mask_and_ack_fall_edge_irq,
-        end_irq,
-        NULL
+        .typename = "Au1000 Fall Edge",
+        .startup = startup_irq,
+        .shutdown = shutdown_irq,
+        .enable = local_enable_irq,
+        .disable = local_disable_irq,
+        .ack = mask_and_ack_fall_edge_irq,
+        .end = end_irq,
 };
 
 static struct hw_interrupt_type either_edge_irq_type = {
-        "Au1000 Rise or Fall Edge",
-        startup_irq,
-        shutdown_irq,
-        local_enable_irq,
-        local_disable_irq,
-        mask_and_ack_either_edge_irq,
-        end_irq,
-        NULL
+        .typename = "Au1000 Rise or Fall Edge",
+        .startup = startup_irq,
+        .shutdown = shutdown_irq,
+        .enable = local_enable_irq,
+        .disable = local_disable_irq,
+        .ack = mask_and_ack_either_edge_irq,
+        .end = end_irq,
 };
 
 static struct hw_interrupt_type level_irq_type = {
-        "Au1000 Level",
-        startup_irq,
-        shutdown_irq,
-        local_enable_irq,
-        local_disable_irq,
-        mask_and_ack_level_irq,
-        end_irq,
-        NULL
+        .typename = "Au1000 Level",
+        .startup = startup_irq,
+        .shutdown = shutdown_irq,
+        .enable = local_enable_irq,
+        .disable = local_disable_irq,
+        .ack = mask_and_ack_level_irq,
+        .end = end_irq,
 };
 
 #ifdef CONFIG_PM
diff --git a/arch/mips/ddb5xxx/ddb5074/nile4_pic.c b/arch/mips/ddb5xxx/ddb5074/nile4_pic.c
index 68c127cd70c9..8743ffce8653 100644
--- a/arch/mips/ddb5xxx/ddb5074/nile4_pic.c
+++ b/arch/mips/ddb5xxx/ddb5074/nile4_pic.c
@@ -209,14 +209,13 @@ static void nile4_irq_end(unsigned int irq) {
 #define nile4_irq_shutdown nile4_disable_irq
 
 static hw_irq_controller nile4_irq_controller = {
-    "nile4",
-    nile4_irq_startup,
-    nile4_irq_shutdown,
-    nile4_enable_irq,
-    nile4_disable_irq,
-    nile4_ack_irq,
-    nile4_irq_end,
-    NULL
+        .typename = "nile4",
+        .startup = nile4_irq_startup,
+        .shutdown = nile4_irq_shutdown,
+        .enable = nile4_enable_irq,
+        .disable = nile4_disable_irq,
+        .ack = nile4_ack_irq,
+        .end = nile4_irq_end,
 };
 
 void nile4_irq_setup(u32 base) {
diff --git a/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c b/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c
index a77682be01ac..f66fe5b58636 100644
--- a/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c
+++ b/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c
@@ -53,14 +53,13 @@ static void vrc5476_irq_end(uint irq)
 }
 
 static hw_irq_controller vrc5476_irq_controller = {
-        "vrc5476",
-        vrc5476_irq_startup,
-        vrc5476_irq_shutdown,
-        vrc5476_irq_enable,
-        vrc5476_irq_disable,
-        vrc5476_irq_ack,
-        vrc5476_irq_end,
-        NULL                            /* no affinity stuff for UP */
+        .typename = "vrc5476",
+        .startup = vrc5476_irq_startup,
+        .shutdown = vrc5476_irq_shutdown,
+        .enable = vrc5476_irq_enable,
+        .disable = vrc5476_irq_disable,
+        .ack = vrc5476_irq_ack,
+        .end = vrc5476_irq_end
 };
 
 void __init
diff --git a/arch/mips/ddb5xxx/ddb5477/irq_5477.c b/arch/mips/ddb5xxx/ddb5477/irq_5477.c
index 0d5e706207ec..5fcd5f070cdc 100644
--- a/arch/mips/ddb5xxx/ddb5477/irq_5477.c
+++ b/arch/mips/ddb5xxx/ddb5477/irq_5477.c
@@ -90,14 +90,13 @@ vrc5477_irq_end(unsigned int irq)
 }
 
 hw_irq_controller vrc5477_irq_controller = {
-        "vrc5477_irq",
-        vrc5477_irq_startup,
-        vrc5477_irq_shutdown,
-        vrc5477_irq_enable,
-        vrc5477_irq_disable,
-        vrc5477_irq_ack,
-        vrc5477_irq_end,
-        NULL                    /* no affinity stuff for UP */
+        .typename = "vrc5477_irq",
+        .startup = vrc5477_irq_startup,
+        .shutdown = vrc5477_irq_shutdown,
+        .enable = vrc5477_irq_enable,
+        .disable = vrc5477_irq_disable,
+        .ack = vrc5477_irq_ack,
+        .end = vrc5477_irq_end
 };
 
 void __init vrc5477_irq_init(u32 irq_base)
diff --git a/arch/mips/ite-boards/generic/irq.c b/arch/mips/ite-boards/generic/irq.c
index cb71b9024d6f..16014e6ebf50 100644
--- a/arch/mips/ite-boards/generic/irq.c
+++ b/arch/mips/ite-boards/generic/irq.c
@@ -138,14 +138,13 @@ static void end_ite_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type it8172_irq_type = {
-        "ITE8172",
-        startup_ite_irq,
-        shutdown_ite_irq,
-        enable_it8172_irq,
-        disable_it8172_irq,
-        mask_and_ack_ite_irq,
-        end_ite_irq,
-        NULL
+        .typename = "ITE8172",
+        .startup = startup_ite_irq,
+        .shutdown = shutdown_ite_irq,
+        .enable = enable_it8172_irq,
+        .disable = disable_it8172_irq,
+        .ack = mask_and_ack_ite_irq,
+        .end = end_ite_irq,
 };
 
 
@@ -159,13 +158,13 @@ static void ack_none(unsigned int irq) { }
 #define end_none        enable_none
 
 static struct hw_interrupt_type cp0_irq_type = {
-        "CP0 Count",
-        startup_none,
-        shutdown_none,
-        enable_none,
-        disable_none,
-        ack_none,
-        end_none
+        .typename = "CP0 Count",
+        .startup = startup_none,
+        .shutdown = shutdown_none,
+        .enable = enable_none,
+        .disable = disable_none,
+        .ack = ack_none,
+        .end = end_none
 };
 
 void enable_cpu_timer(void)
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index 0b608fa98d5a..b309b1bcf2e8 100644
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -58,14 +58,13 @@ static void end_r4030_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type r4030_irq_type = {
-        "R4030",
-        startup_r4030_irq,
-        shutdown_r4030_irq,
-        enable_r4030_irq,
-        disable_r4030_irq,
-        mask_and_ack_r4030_irq,
-        end_r4030_irq,
-        NULL
+        .typename = "R4030",
+        .startup = startup_r4030_irq,
+        .shutdown = shutdown_r4030_irq,
+        .enable = enable_r4030_irq,
+        .disable = disable_r4030_irq,
+        .ack = mask_and_ack_r4030_irq,
+        .end = end_r4030_irq,
 };
 
 void __init init_r4030_ints(void)
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c
index b9799b86fc79..7cbe14483f13 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/jmr3927/rbhma3100/irq.c
@@ -412,13 +412,13 @@ void __init arch_init_irq(void)
 }
 
 static hw_irq_controller jmr3927_irq_controller = {
-        "jmr3927_irq",
-        jmr3927_irq_startup,
-        jmr3927_irq_shutdown,
-        jmr3927_irq_enable,
-        jmr3927_irq_disable,
-        jmr3927_irq_ack,
-        jmr3927_irq_end,
+        .typename = "jmr3927_irq",
+        .startup = jmr3927_irq_startup,
+        .shutdown = jmr3927_irq_shutdown,
+        .enable = jmr3927_irq_enable,
+        .disable = jmr3927_irq_disable,
+        .ack = jmr3927_irq_ack,
+        .end = jmr3927_irq_end,
 };
 
 void jmr3927_irq_init(u32 irq_base)
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,
 };
 
 
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index c90da1639440..852a41901a5e 100644
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -71,14 +71,13 @@ static void end_lasat_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type lasat_irq_type = {
-        "Lasat",
-        startup_lasat_irq,
-        shutdown_lasat_irq,
-        enable_lasat_irq,
-        disable_lasat_irq,
-        mask_and_ack_lasat_irq,
-        end_lasat_irq,
-        NULL
+        .typename = "Lasat",
+        .startup = startup_lasat_irq,
+        .shutdown = shutdown_lasat_irq,
+        .enable = enable_lasat_irq,
+        .disable = disable_lasat_irq,
+        .ack = mask_and_ack_lasat_irq,
+        .end = end_lasat_irq,
 };
 
 static inline int ls1bit32(unsigned int x)
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c
index 19d4b0792460..bc0ebc69bfb3 100644
--- a/arch/mips/mips-boards/atlas/atlas_int.c
+++ b/arch/mips/mips-boards/atlas/atlas_int.c
@@ -76,14 +76,13 @@ static void end_atlas_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type atlas_irq_type = {
-        "Atlas",
-        startup_atlas_irq,
-        shutdown_atlas_irq,
-        enable_atlas_irq,
-        disable_atlas_irq,
-        mask_and_ack_atlas_irq,
-        end_atlas_irq,
-        NULL
+        .typename = "Atlas",
+        .startup = startup_atlas_irq,
+        .shutdown = shutdown_atlas_irq,
+        .enable = enable_atlas_irq,
+        .disable = disable_atlas_irq,
+        .ack = mask_and_ack_atlas_irq,
+        .end = end_atlas_irq,
 };
 
 static inline int ls1bit32(unsigned int x)
diff --git a/arch/mips/momentum/ocelot_c/cpci-irq.c b/arch/mips/momentum/ocelot_c/cpci-irq.c
index dea48b3ad687..bd885785e2f9 100644
--- a/arch/mips/momentum/ocelot_c/cpci-irq.c
+++ b/arch/mips/momentum/ocelot_c/cpci-irq.c
@@ -129,14 +129,13 @@ void ll_cpci_irq(struct pt_regs *regs)
 #define shutdown_cpci_irq       disable_cpci_irq
 
 struct hw_interrupt_type cpci_irq_type = {
-        "CPCI/FPGA",
-        startup_cpci_irq,
-        shutdown_cpci_irq,
-        enable_cpci_irq,
-        disable_cpci_irq,
-        mask_and_ack_cpci_irq,
-        end_cpci_irq,
-        NULL
+        .typename = "CPCI/FPGA",
+        .startup = startup_cpci_irq,
+        .shutdown = shutdown_cpci_irq,
+        .enable = enable_cpci_irq,
+        .disable = disable_cpci_irq,
+        .ack = mask_and_ack_cpci_irq,
+        .end = end_cpci_irq,
 };
 
 void cpci_irq_init(void)
diff --git a/arch/mips/momentum/ocelot_c/uart-irq.c b/arch/mips/momentum/ocelot_c/uart-irq.c
index ebe1507b17df..755bde5146be 100644
--- a/arch/mips/momentum/ocelot_c/uart-irq.c
+++ b/arch/mips/momentum/ocelot_c/uart-irq.c
@@ -122,14 +122,13 @@ void ll_uart_irq(struct pt_regs *regs)
 #define shutdown_uart_irq       disable_uart_irq
 
 struct hw_interrupt_type uart_irq_type = {
-        "UART/FPGA",
-        startup_uart_irq,
-        shutdown_uart_irq,
-        enable_uart_irq,
-        disable_uart_irq,
-        mask_and_ack_uart_irq,
-        end_uart_irq,
-        NULL
+        .typename = "UART/FPGA",
+        .startup = startup_uart_irq,
+        .shutdown = shutdown_uart_irq,
+        .enable = enable_uart_irq,
+        .disable = disable_uart_irq,
+        .ack = mask_and_ack_uart_irq,
+        .end = end_uart_irq,
 };
 
 void uart_irq_init(void)
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c
index fc3a8e90d763..2eb22d692ed9 100644
--- a/arch/mips/sgi-ip32/ip32-irq.c
+++ b/arch/mips/sgi-ip32/ip32-irq.c
@@ -163,14 +163,13 @@ static void end_cpu_irq(unsigned int irq)
 #define mask_and_ack_cpu_irq disable_cpu_irq
 
 static struct hw_interrupt_type ip32_cpu_interrupt = {
-        "IP32 CPU",
-        startup_cpu_irq,
-        shutdown_cpu_irq,
-        enable_cpu_irq,
-        disable_cpu_irq,
-        mask_and_ack_cpu_irq,
-        end_cpu_irq,
-        NULL
+        .typename = "IP32 CPU",
+        .startup = startup_cpu_irq,
+        .shutdown = shutdown_cpu_irq,
+        .enable = enable_cpu_irq,
+        .disable = disable_cpu_irq,
+        .ack = mask_and_ack_cpu_irq,
+        .end = end_cpu_irq,
 };
 
 /*
@@ -234,14 +233,13 @@ static void end_crime_irq(unsigned int irq)
 #define shutdown_crime_irq disable_crime_irq
 
 static struct hw_interrupt_type ip32_crime_interrupt = {
-        "IP32 CRIME",
-        startup_crime_irq,
-        shutdown_crime_irq,
-        enable_crime_irq,
-        disable_crime_irq,
-        mask_and_ack_crime_irq,
-        end_crime_irq,
-        NULL
+        .typename = "IP32 CRIME",
+        .startup = startup_crime_irq,
+        .shutdown = shutdown_crime_irq,
+        .enable = enable_crime_irq,
+        .disable = disable_crime_irq,
+        .ack = mask_and_ack_crime_irq,
+        .end = end_crime_irq,
 };
 
 /*
@@ -294,14 +292,13 @@ static void end_macepci_irq(unsigned int irq)
 #define mask_and_ack_macepci_irq disable_macepci_irq
 
 static struct hw_interrupt_type ip32_macepci_interrupt = {
-        "IP32 MACE PCI",
-        startup_macepci_irq,
-        shutdown_macepci_irq,
-        enable_macepci_irq,
-        disable_macepci_irq,
-        mask_and_ack_macepci_irq,
-        end_macepci_irq,
-        NULL
+        .typename = "IP32 MACE PCI",
+        .startup = startup_macepci_irq,
+        .shutdown = shutdown_macepci_irq,
+        .enable = enable_macepci_irq,
+        .disable = disable_macepci_irq,
+        .ack = mask_and_ack_macepci_irq,
+        .end = end_macepci_irq,
 };
 
 /* This is used for MACE ISA interrupts.  That means bits 4-6 in the
@@ -425,14 +422,13 @@ static void end_maceisa_irq(unsigned irq)
 #define shutdown_maceisa_irq disable_maceisa_irq
 
 static struct hw_interrupt_type ip32_maceisa_interrupt = {
-        "IP32 MACE ISA",
-        startup_maceisa_irq,
-        shutdown_maceisa_irq,
-        enable_maceisa_irq,
-        disable_maceisa_irq,
-        mask_and_ack_maceisa_irq,
-        end_maceisa_irq,
-        NULL
+        .typename = "IP32 MACE ISA",
+        .startup = startup_maceisa_irq,
+        .shutdown = shutdown_maceisa_irq,
+        .enable = enable_maceisa_irq,
+        .disable = disable_maceisa_irq,
+        .ack = mask_and_ack_maceisa_irq,
+        .end = end_maceisa_irq,
 };
 
 /* This is used for regular non-ISA, non-PCI MACE interrupts.  That means
@@ -476,14 +472,13 @@ static void end_mace_irq(unsigned int irq)
 #define mask_and_ack_mace_irq disable_mace_irq
 
 static struct hw_interrupt_type ip32_mace_interrupt = {
-        "IP32 MACE",
-        startup_mace_irq,
-        shutdown_mace_irq,
-        enable_mace_irq,
-        disable_mace_irq,
-        mask_and_ack_mace_irq,
-        end_mace_irq,
-        NULL
+        .typename = "IP32 MACE",
+        .startup = startup_mace_irq,
+        .shutdown = shutdown_mace_irq,
+        .enable = enable_mace_irq,
+        .disable = disable_mace_irq,
+        .ack = mask_and_ack_mace_irq,
+        .end = end_mace_irq,
 };
 
 static void ip32_unknown_interrupt(struct pt_regs *regs)
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index a62cba9f32ba..b9f1ff420fef 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -71,17 +71,15 @@ extern char sb1250_duart_present[];
 #endif
 
 static struct hw_interrupt_type sb1250_irq_type = {
-        "SB1250-IMR",
-        startup_sb1250_irq,
-        shutdown_sb1250_irq,
-        enable_sb1250_irq,
-        disable_sb1250_irq,
-        ack_sb1250_irq,
-        end_sb1250_irq,
+        .typename = "SB1250-IMR",
+        .startup = startup_sb1250_irq,
+        .shutdown = shutdown_sb1250_irq,
+        .enable = enable_sb1250_irq,
+        .disable = disable_sb1250_irq,
+        .ack = ack_sb1250_irq,
+        .end = end_sb1250_irq,
 #ifdef CONFIG_SMP
-        sb1250_set_affinity
-#else
-        NULL
+        .set_affinity = sb1250_set_affinity
 #endif
 };
 
diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c
index 141a310d74d8..952038aa4b90 100644
--- a/arch/mips/sni/irq.c
+++ b/arch/mips/sni/irq.c
@@ -58,14 +58,13 @@ static void end_pciasic_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type pciasic_irq_type = {
-        "ASIC-PCI",
-        startup_pciasic_irq,
-        shutdown_pciasic_irq,
-        enable_pciasic_irq,
-        disable_pciasic_irq,
-        mask_and_ack_pciasic_irq,
-        end_pciasic_irq,
-        NULL
+        .typename = "ASIC-PCI",
+        .startup = startup_pciasic_irq,
+        .shutdown = shutdown_pciasic_irq,
+        .enable = enable_pciasic_irq,
+        .disable = disable_pciasic_irq,
+        .ack = mask_and_ack_pciasic_irq,
+        .end = end_pciasic_irq,
 };
 
 /*