3 files changed, 21 insertions, 24 deletions

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)