5 files changed, 56 insertions, 52 deletions

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 9383063d2b16..bcd5d54b7d4d 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -296,25 +296,25 @@ static struct pci_port_ops dino_port_ops = {
         .outl   = dino_out32
 };
 
-static void dino_mask_irq(unsigned int irq)
+static void dino_mask_irq(struct irq_data *d)
 {
-        struct dino_device *dino_dev = get_irq_chip_data(irq);
-        int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
+        struct dino_device *dino_dev = irq_data_get_irq_chip_data(d);
+        int local_irq = gsc_find_local_irq(d->irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
 
-        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, irq);
+        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, d->irq);
 
         /* Clear the matching bit in the IMR register */
         dino_dev->imr &= ~(DINO_MASK_IRQ(local_irq));
         __raw_writel(dino_dev->imr, dino_dev->hba.base_addr+DINO_IMR);
 }
 
-static void dino_unmask_irq(unsigned int irq)
+static void dino_unmask_irq(struct irq_data *d)
 {
-        struct dino_device *dino_dev = get_irq_chip_data(irq);
-        int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
+        struct dino_device *dino_dev = irq_data_get_irq_chip_data(d);
+        int local_irq = gsc_find_local_irq(d->irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
         u32 tmp;
 
-        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, irq);
+        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, d->irq);
 
         /*
         ** clear pending IRQ bits
@@ -346,9 +346,9 @@ static void dino_unmask_irq(unsigned int irq)
 }
 
 static struct irq_chip dino_interrupt_type = {
-        .name   = "GSC-PCI",
-        .unmask = dino_unmask_irq,
-        .mask   = dino_mask_irq,
+        .name           = "GSC-PCI",
+        .irq_unmask     = dino_unmask_irq,
+        .irq_mask       = dino_mask_irq,
 };
 
 
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index e860038b0b84..deeec32a5803 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -144,8 +144,9 @@ static unsigned int eisa_irq_level __read_mostly; /* default to edge triggered *
 
 
 /* called by free irq */
-static void eisa_mask_irq(unsigned int irq)
+static void eisa_mask_irq(struct irq_data *d)
 {
+        unsigned int irq = d->irq;
         unsigned long flags;
 
         EISA_DBG("disable irq %d\n", irq);
@@ -164,8 +165,9 @@ static void eisa_mask_irq(unsigned int irq)
 }
 
 /* called by request irq */
-static void eisa_unmask_irq(unsigned int irq)
+static void eisa_unmask_irq(struct irq_data *d)
 {
+        unsigned int irq = d->irq;
         unsigned long flags;
         EISA_DBG("enable irq %d\n", irq);
                 
@@ -183,9 +185,9 @@ static void eisa_unmask_irq(unsigned int irq)
 }
 
 static struct irq_chip eisa_interrupt_type = {
-        .name   =       "EISA",
-        .unmask =       eisa_unmask_irq,
-        .mask   =       eisa_mask_irq,
+        .name           =       "EISA",
+        .irq_unmask     =       eisa_unmask_irq,
+        .irq_mask       =       eisa_mask_irq,
 };
 
 static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index 772b1939ac21..ef31080cf591 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -105,13 +105,13 @@ int gsc_find_local_irq(unsigned int irq, int *global_irqs, int limit)
         return NO_IRQ;
 }
 
-static void gsc_asic_mask_irq(unsigned int irq)
+static void gsc_asic_mask_irq(struct irq_data *d)
 {
-        struct gsc_asic *irq_dev = get_irq_chip_data(irq);
-        int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
+        struct gsc_asic *irq_dev = irq_data_get_irq_chip_data(d);
+        int local_irq = gsc_find_local_irq(d->irq, irq_dev->global_irq, 32);
         u32 imr;
 
-        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, irq,
+        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, d->irq,
                         irq_dev->name, imr);
 
         /* Disable the IRQ line by clearing the bit in the IMR */
@@ -120,13 +120,13 @@ static void gsc_asic_mask_irq(unsigned int irq)
         gsc_writel(imr, irq_dev->hpa + OFFSET_IMR);
 }
 
-static void gsc_asic_unmask_irq(unsigned int irq)
+static void gsc_asic_unmask_irq(struct irq_data *d)
 {
-        struct gsc_asic *irq_dev = get_irq_chip_data(irq);
-        int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
+        struct gsc_asic *irq_dev = irq_data_get_irq_chip_data(d);
+        int local_irq = gsc_find_local_irq(d->irq, irq_dev->global_irq, 32);
         u32 imr;
 
-        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, irq,
+        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, d->irq,
                         irq_dev->name, imr);
 
         /* Enable the IRQ line by setting the bit in the IMR */
@@ -140,9 +140,9 @@ static void gsc_asic_unmask_irq(unsigned int irq)
 }
 
 static struct irq_chip gsc_asic_interrupt_type = {
-        .name   =       "GSC-ASIC",
-        .unmask =       gsc_asic_unmask_irq,
-        .mask   =       gsc_asic_mask_irq,
+        .name           =       "GSC-ASIC",
+        .irq_unmask     =       gsc_asic_unmask_irq,
+        .irq_mask       =       gsc_asic_mask_irq,
 };
 
 int gsc_assign_irq(struct irq_chip *type, void *data)
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 0327894bf235..95930d016235 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -615,10 +615,10 @@ iosapic_set_irt_data( struct vector_info *vi, u32 *dp0, u32 *dp1)
 }
 
 
-static void iosapic_mask_irq(unsigned int irq)
+static void iosapic_mask_irq(struct irq_data *d)
 {
         unsigned long flags;
-        struct vector_info *vi = get_irq_chip_data(irq);
+        struct vector_info *vi = irq_data_get_irq_chip_data(d);
         u32 d0, d1;
 
         spin_lock_irqsave(&iosapic_lock, flags);
@@ -628,9 +628,9 @@ static void iosapic_mask_irq(unsigned int irq)
         spin_unlock_irqrestore(&iosapic_lock, flags);
 }
 
-static void iosapic_unmask_irq(unsigned int irq)
+static void iosapic_unmask_irq(struct irq_data *d)
 {
-        struct vector_info *vi = get_irq_chip_data(irq);
+        struct vector_info *vi = irq_data_get_irq_chip_data(d);
         u32 d0, d1;
 
         /* data is initialized by fixup_irq */
@@ -666,34 +666,34 @@ printk("\n");
          * enables their IRQ. It can lead to "interesting" race conditions
          * in the driver initialization sequence.
          */
-        DBG(KERN_DEBUG "enable_irq(%d): eoi(%p, 0x%x)\n", irq,
+        DBG(KERN_DEBUG "enable_irq(%d): eoi(%p, 0x%x)\n", d->irq,
                         vi->eoi_addr, vi->eoi_data);
         iosapic_eoi(vi->eoi_addr, vi->eoi_data);
 }
 
-static void iosapic_eoi_irq(unsigned int irq)
+static void iosapic_eoi_irq(struct irq_data *d)
 {
-        struct vector_info *vi = get_irq_chip_data(irq);
+        struct vector_info *vi = irq_data_get_irq_chip_data(d);
 
         iosapic_eoi(vi->eoi_addr, vi->eoi_data);
-        cpu_eoi_irq(irq);
+        cpu_eoi_irq(d);
 }
 
 #ifdef CONFIG_SMP
-static int iosapic_set_affinity_irq(unsigned int irq,
-                                     const struct cpumask *dest)
+static int iosapic_set_affinity_irq(struct irq_data *d,
+                                    const struct cpumask *dest, bool force)
 {
-        struct vector_info *vi = get_irq_chip_data(irq);
+        struct vector_info *vi = irq_data_get_irq_chip_data(d);
         u32 d0, d1, dummy_d0;
         unsigned long flags;
         int dest_cpu;
 
-        dest_cpu = cpu_check_affinity(irq, dest);
+        dest_cpu = cpu_check_affinity(d, dest);
         if (dest_cpu < 0)
                 return -1;
 
-        cpumask_copy(irq_desc[irq].affinity, cpumask_of(dest_cpu));
-        vi->txn_addr = txn_affinity_addr(irq, dest_cpu);
+        cpumask_copy(d->affinity, cpumask_of(dest_cpu));
+        vi->txn_addr = txn_affinity_addr(d->irq, dest_cpu);
 
         spin_lock_irqsave(&iosapic_lock, flags);
         /* d1 contains the destination CPU, so only want to set that
@@ -708,13 +708,13 @@ static int iosapic_set_affinity_irq(unsigned int irq,
 #endif
 
 static struct irq_chip iosapic_interrupt_type = {
-        .name   =       "IO-SAPIC-level",
-        .unmask =       iosapic_unmask_irq,
-        .mask   =       iosapic_mask_irq,
-        .ack    =       cpu_ack_irq,
-        .eoi    =       iosapic_eoi_irq,
+        .name           =       "IO-SAPIC-level",
+        .irq_unmask     =       iosapic_unmask_irq,
+        .irq_mask       =       iosapic_mask_irq,
+        .irq_ack        =       cpu_ack_irq,
+        .irq_eoi        =       iosapic_eoi_irq,
 #ifdef CONFIG_SMP
-        .set_affinity = iosapic_set_affinity_irq,
+        .irq_set_affinity =     iosapic_set_affinity_irq,
 #endif
 };
 
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 28241532c0fd..a4d8ff66a639 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -286,8 +286,9 @@ superio_init(struct pci_dev *pcidev)
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_LIO, superio_init);
 
-static void superio_mask_irq(unsigned int irq)
+static void superio_mask_irq(struct irq_data *d)
 {
+        unsigned int irq = d->irq;
         u8 r8;
 
         if ((irq < 1) || (irq == 2) || (irq > 7)) {
@@ -303,8 +304,9 @@ static void superio_mask_irq(unsigned int irq)
         outb (r8,IC_PIC1+1);
 }
 
-static void superio_unmask_irq(unsigned int irq)
+static void superio_unmask_irq(struct irq_data *d)
 {
+        unsigned int irq = d->irq;
         u8 r8;
 
         if ((irq < 1) || (irq == 2) || (irq > 7)) {
@@ -320,9 +322,9 @@ static void superio_unmask_irq(unsigned int irq)
 }
 
 static struct irq_chip superio_interrupt_type = {
-        .name   =       SUPERIO,
-        .unmask =       superio_unmask_irq,
-        .mask   =       superio_mask_irq,
+        .name           =       SUPERIO,
+        .irq_unmask     =       superio_unmask_irq,
+        .irq_mask       =       superio_mask_irq,
 };
 
 #ifdef DEBUG_SUPERIO_INIT