alpha: use set_irq_chip and push down __do_IRQ to the machine types

Also kill superfluous IRQ_DISABLED initialization, since that's the
default state of the irq_desc[i].status field.

Tested-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Kyle McMartin <kyle@redhat.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>

20 files changed, 59 insertions, 48 deletions

diff --git a/arch/alpha/include/asm/irq.h b/arch/alpha/include/asm/irq.h
index 06377400dc0..4126441c8ef 100644
--- a/arch/alpha/include/asm/irq.h
+++ b/arch/alpha/include/asm/irq.h
@@ -88,4 +88,7 @@ static __inline__ int irq_canonicalize(int irq)
 struct pt_regs;
 extern void (*perf_irq)(unsigned long, struct pt_regs *);
 
+struct irq_desc;
+extern void alpha_do_IRQ(unsigned int irq, struct irq_desc *desc);
+
 #endif /* _ALPHA_IRQ_H */
diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index fe912984d9b..ecfa51eafd7 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -159,6 +159,11 @@ handle_irq(int irq)
          * at IPL 0.
          */
         local_irq_disable();
-        __do_IRQ(irq);
+        generic_handle_irq(irq);
         irq_exit();
 }
+
+void alpha_do_IRQ(unsigned int irq, struct irq_desc *desc)
+{
+        __do_IRQ(irq);
+}
diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c
index 83a9ac28089..39299fbb637 100644
--- a/arch/alpha/kernel/irq_i8259.c
+++ b/arch/alpha/kernel/irq_i8259.c
@@ -107,8 +107,7 @@ init_i8259a_irqs(void)
         outb(0xff, 0xA1);       /* mask all of 8259A-2 */
 
         for (i = 0; i < 16; i++) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].chip = &i8259a_irq_type;
+                set_irq_chip_and_handler(i, &i8259a_irq_type, alpha_do_IRQ);
         }
 
         setup_irq(2, &cascade);
diff --git a/arch/alpha/kernel/irq_pyxis.c b/arch/alpha/kernel/irq_pyxis.c
index 989ce46a0cf..4e1904cd0fc 100644
--- a/arch/alpha/kernel/irq_pyxis.c
+++ b/arch/alpha/kernel/irq_pyxis.c
@@ -119,8 +119,8 @@ init_pyxis_irqs(unsigned long ignore_mask)
         for (i = 16; i < 48; ++i) {
                 if ((ignore_mask >> i) & 1)
                         continue;
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = &pyxis_irq_type;
+                set_irq_chip_and_handler(i, &pyxis_irq_type, alpha_do_IRQ);
+                irq_desc[i].status |= IRQ_LEVEL;
         }
 
         setup_irq(16+7, &isa_cascade_irqaction);
diff --git a/arch/alpha/kernel/irq_srm.c b/arch/alpha/kernel/irq_srm.c
index d63e93e1e8b..b337cfc9d6b 100644
--- a/arch/alpha/kernel/irq_srm.c
+++ b/arch/alpha/kernel/irq_srm.c
@@ -68,8 +68,8 @@ init_srm_irqs(long max, unsigned long ignore_mask)
         for (i = 16; i < max; ++i) {
                 if (i < 64 && ((ignore_mask >> i) & 1))
                         continue;
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = &srm_irq_type;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, &srm_irq_type, alpha_do_IRQ);
         }
 }
 
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index 20a30b8b965..d8c918384f2 100644
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -142,8 +142,8 @@ alcor_init_irq(void)
                    on while IRQ probing.  */
                 if (i >= 16+20 && i <= 16+30)
                         continue;
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = &alcor_irq_type;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, &alcor_irq_type, alpha_do_IRQ);
         }
         i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq;
 
diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
index 14c8898d19e..ba38fcd347d 100644
--- a/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@ -122,8 +122,9 @@ common_init_irq(void (*srm_dev_int)(unsigned long v))
                 outb(0xff, 0x806);
 
                 for (i = 16; i < 35; ++i) {
-                        irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                        irq_desc[i].chip = &cabriolet_irq_type;
+                        set_irq_chip_and_handler(i, &cabriolet_irq_type,
+                                alpha_do_IRQ);
+                        irq_desc[i].status |= IRQ_LEVEL;
                 }
         }
 
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c
index 4026502ab70..147154d372e 100644
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
@@ -302,8 +302,8 @@ init_tsunami_irqs(struct irq_chip * ops, int imin, int imax)
 {
         long i;
         for (i = imin; i <= imax; ++i) {
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = ops;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, ops, alpha_do_IRQ);
         }
 }
 
diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c
index df2090ce5e7..cb309a422c0 100644
--- a/arch/alpha/kernel/sys_eb64p.c
+++ b/arch/alpha/kernel/sys_eb64p.c
@@ -135,8 +135,8 @@ eb64p_init_irq(void)
         init_i8259a_irqs();
 
         for (i = 16; i < 32; ++i) {
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = &eb64p_irq_type;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, &eb64p_irq_type, alpha_do_IRQ);
         }               
 
         common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_eiger.c b/arch/alpha/kernel/sys_eiger.c
index 3ca1dbcf404..16a5483cb75 100644
--- a/arch/alpha/kernel/sys_eiger.c
+++ b/arch/alpha/kernel/sys_eiger.c
@@ -153,8 +153,8 @@ eiger_init_irq(void)
         init_i8259a_irqs();
 
         for (i = 16; i < 128; ++i) {
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = &eiger_irq_type;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, &eiger_irq_type, alpha_do_IRQ);
         }
 }
 
diff --git a/arch/alpha/kernel/sys_jensen.c b/arch/alpha/kernel/sys_jensen.c
index 7a7ae36fff9..5b64f913bed 100644
--- a/arch/alpha/kernel/sys_jensen.c
+++ b/arch/alpha/kernel/sys_jensen.c
@@ -206,11 +206,11 @@ jensen_init_irq(void)
 {
         init_i8259a_irqs();
 
-        irq_desc[1].chip = &jensen_local_irq_type;
-        irq_desc[4].chip = &jensen_local_irq_type;
-        irq_desc[3].chip = &jensen_local_irq_type;
-        irq_desc[7].chip = &jensen_local_irq_type;
-        irq_desc[9].chip = &jensen_local_irq_type;
+        set_irq_chip_and_handler(1, &jensen_local_irq_type, alpha_do_IRQ);
+        set_irq_chip_and_handler(4, &jensen_local_irq_type, alpha_do_IRQ);
+        set_irq_chip_and_handler(3, &jensen_local_irq_type, alpha_do_IRQ);
+        set_irq_chip_and_handler(7, &jensen_local_irq_type, alpha_do_IRQ);
+        set_irq_chip_and_handler(9, &jensen_local_irq_type, alpha_do_IRQ);
 
         common_init_isa_dma();
 }
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index 0bb3b5c4f69..0d0699eef08 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -304,8 +304,8 @@ init_io7_irqs(struct io7 *io7,
 
         /* Set up the lsi irqs.  */
         for (i = 0; i < 128; ++i) {
-                irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[base + i].chip = lsi_ops;
+                irq_desc[base + i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(base + i, lsi_ops, alpha_do_IRQ);
         }
 
         /* Disable the implemented irqs in hardware.  */
@@ -318,8 +318,8 @@ init_io7_irqs(struct io7 *io7,
 
         /* Set up the msi irqs.  */
         for (i = 128; i < (128 + 512); ++i) {
-                irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[base + i].chip = msi_ops;
+                irq_desc[base + i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(base + i, msi_ops, alpha_do_IRQ);
         }
 
         for (i = 0; i < 16; ++i)
@@ -336,8 +336,8 @@ marvel_init_irq(void)
 
         /* Reserve the legacy irqs.  */
         for (i = 0; i < 16; ++i) {
-                irq_desc[i].status = IRQ_DISABLED;
-                irq_desc[i].chip = &marvel_legacy_irq_type;
+                set_irq_chip_and_handler(i, &marvel_legacy_irq_type,
+                        alpha_do_IRQ);
         }
 
         /* Init the io7 irqs.  */
diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c
index ee886516981..a27bc56ddda 100644
--- a/arch/alpha/kernel/sys_mikasa.c
+++ b/arch/alpha/kernel/sys_mikasa.c
@@ -115,8 +115,8 @@ mikasa_init_irq(void)
         mikasa_update_irq_hw(0);
 
         for (i = 16; i < 32; ++i) {
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = &mikasa_irq_type;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, &mikasa_irq_type, alpha_do_IRQ);
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_noritake.c b/arch/alpha/kernel/sys_noritake.c
index 86503fe73a8..a4f07d6c939 100644
--- a/arch/alpha/kernel/sys_noritake.c
+++ b/arch/alpha/kernel/sys_noritake.c
@@ -144,8 +144,8 @@ noritake_init_irq(void)
         outw(0, 0x54c);
 
         for (i = 16; i < 48; ++i) {
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = &noritake_irq_type;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, &noritake_irq_type, alpha_do_IRQ);
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_rawhide.c b/arch/alpha/kernel/sys_rawhide.c
index 26c322bf89e..a63da5c6eb8 100644
--- a/arch/alpha/kernel/sys_rawhide.c
+++ b/arch/alpha/kernel/sys_rawhide.c
@@ -194,8 +194,8 @@ rawhide_init_irq(void)
         }
 
         for (i = 16; i < 128; ++i) {
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = &rawhide_irq_type;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, &rawhide_irq_type, alpha_do_IRQ);
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c
index be161129eab..0465716d343 100644
--- a/arch/alpha/kernel/sys_rx164.c
+++ b/arch/alpha/kernel/sys_rx164.c
@@ -116,8 +116,8 @@ rx164_init_irq(void)
 
         rx164_update_irq_hw(0);
         for (i = 16; i < 40; ++i) {
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = &rx164_irq_type;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, &rx164_irq_type, alpha_do_IRQ);
         }
 
         init_i8259a_irqs();
diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c
index b2abe27a23c..944b598b80e 100644
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
@@ -535,8 +535,9 @@ sable_lynx_init_irq(int nr_of_irqs)
         long i;
 
         for (i = 0; i < nr_of_irqs; ++i) {
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = &sable_lynx_irq_type;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, &sable_lynx_irq_type,
+                        alpha_do_IRQ);
         }
 
         common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c
index 4da596b6adb..00df4e7b8d7 100644
--- a/arch/alpha/kernel/sys_takara.c
+++ b/arch/alpha/kernel/sys_takara.c
@@ -153,8 +153,8 @@ takara_init_irq(void)
                 takara_update_irq_hw(i, -1);
 
         for (i = 16; i < 128; ++i) {
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = &takara_irq_type;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, &takara_irq_type, alpha_do_IRQ);
         }
 
         common_init_isa_dma();
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c
index 9008d0f20c5..ffa48e8a27c 100644
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
@@ -189,8 +189,8 @@ init_titan_irqs(struct irq_chip * ops, int imin, int imax)
 {
         long i;
         for (i = imin; i <= imax; ++i) {
-                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i].chip = ops;
+                irq_desc[i].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i, ops, alpha_do_IRQ);
         }
 }
 
diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c
index 62fd972e18e..ea86103f53c 100644
--- a/arch/alpha/kernel/sys_wildfire.c
+++ b/arch/alpha/kernel/sys_wildfire.c
@@ -198,15 +198,17 @@ wildfire_init_irq_per_pca(int qbbno, int pcano)
         for (i = 0; i < 16; ++i) {
                 if (i == 2)
                         continue;
-                irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i+irq_bias].chip = &wildfire_irq_type;
+                irq_desc[i+irq_bias].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i+irq_bias, &wildfire_irq_type,
+                        alpha_do_IRQ);
         }
 
-        irq_desc[36+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
-        irq_desc[36+irq_bias].chip = &wildfire_irq_type;
+        irq_desc[36+irq_bias].status |= IRQ_LEVEL;
+        set_irq_chip_and_handler(36+irq_bias, &wildfire_irq_type, alpha_do_IRQ);
         for (i = 40; i < 64; ++i) {
-                irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
-                irq_desc[i+irq_bias].chip = &wildfire_irq_type;
+                irq_desc[i+irq_bias].status |= IRQ_LEVEL;
+                set_irq_chip_and_handler(i+irq_bias, &wildfire_irq_type,
+                        alpha_do_IRQ);
         }
 
         setup_irq(32+irq_bias, &isa_enable);