3 files changed, 15 insertions, 13 deletions

diff --git a/arch/i386/kernel/i8259.c b/arch/i386/kernel/i8259.c
index c1a42feba28..3c6063671a9 100644
--- a/arch/i386/kernel/i8259.c
+++ b/arch/i386/kernel/i8259.c
@@ -132,7 +132,7 @@ void make_8259A_irq(unsigned int irq)
 {
         disable_irq_nosync(irq);
         io_apic_irqs &= ~(1<<irq);
-        irq_desc[irq].handler = &i8259A_irq_type;
+        irq_desc[irq].chip = &i8259A_irq_type;
         enable_irq(irq);
 }
 
@@ -386,12 +386,12 @@ void __init init_ISA_irqs (void)
                         /*
                          * 16 old-style INTA-cycle interrupts:
                          */
-                        irq_desc[i].handler = &i8259A_irq_type;
+                        irq_desc[i].chip = &i8259A_irq_type;
                 } else {
                         /*
                          * 'high' PCI IRQs filled in on demand
                          */
-                        irq_desc[i].handler = &no_irq_type;
+                        irq_desc[i].chip = &no_irq_type;
                 }
         }
 }
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 72ae414e4d4..4a74b696c6a 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -1205,15 +1205,17 @@ static struct hw_interrupt_type ioapic_edge_type;
 #define IOAPIC_EDGE     0
 #define IOAPIC_LEVEL    1
 
-static inline void ioapic_register_intr(int irq, int vector, unsigned long trigger)
+static void ioapic_register_intr(int irq, int vector, unsigned long trigger)
 {
-        unsigned idx = use_pci_vector() && !platform_legacy_irq(irq) ? vector : irq;
+        unsigned idx;
+
+        idx = use_pci_vector() && !platform_legacy_irq(irq) ? vector : irq;
 
         if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
                         trigger == IOAPIC_LEVEL)
-                irq_desc[idx].handler = &ioapic_level_type;
+                irq_desc[idx].chip = &ioapic_level_type;
         else
-                irq_desc[idx].handler = &ioapic_edge_type;
+                irq_desc[idx].chip = &ioapic_edge_type;
         set_intr_gate(vector, interrupt[idx]);
 }
 
@@ -1325,7 +1327,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in
          * The timer IRQ doesn't have to know that behind the
          * scene we have a 8259A-master in AEOI mode ...
          */
-        irq_desc[0].handler = &ioapic_edge_type;
+        irq_desc[0].chip = &ioapic_edge_type;
 
         /*
          * Add it to the IO-APIC irq-routing table:
@@ -2135,7 +2137,7 @@ static inline void init_IO_APIC_traps(void)
                                 make_8259A_irq(irq);
                         else
                                 /* Strange. Oh, well.. */
-                                irq_desc[irq].handler = &no_irq_type;
+                                irq_desc[irq].chip = &no_irq_type;
                 }
         }
 }
@@ -2351,7 +2353,7 @@ static inline void check_timer(void)
         printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");
 
         disable_8259A_irq(0);
-        irq_desc[0].handler = &lapic_irq_type;
+        irq_desc[0].chip = &lapic_irq_type;
         apic_write_around(APIC_LVT0, APIC_DM_FIXED | vector);   /* Fixed mode */
         enable_8259A_irq(0);
 
diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c
index 9eec9435318..b942a5918da 100644
--- a/arch/i386/kernel/irq.c
+++ b/arch/i386/kernel/irq.c
@@ -249,7 +249,7 @@ int show_interrupts(struct seq_file *p, void *v)
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
 #endif
-                seq_printf(p, " %14s", irq_desc[i].handler->typename);
+                seq_printf(p, " %14s", irq_desc[i].chip->typename);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)
@@ -296,8 +296,8 @@ void fixup_irqs(cpumask_t map)
                         printk("Breaking affinity for irq %i\n", irq);
                         mask = map;
                 }
-                if (irq_desc[irq].handler->set_affinity)
-                        irq_desc[irq].handler->set_affinity(irq, mask);
+                if (irq_desc[irq].chip->set_affinity)
+                        irq_desc[irq].chip->set_affinity(irq, mask);
                 else if (irq_desc[irq].action && !(warned++))
                         printk("Cannot set affinity for irq %i\n", irq);
         }