powerpc: sysdev/i8259 irq_data conversion.

Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index 6323e70e6bf41902e65ce0c2265674ae7a1a7497..aeda4c8d0a0ae6586fd0f1bfeefda32061799f3c 100644 (file)
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -78,19 +78,19 @@ unsigned int i8259_irq(void)
        return irq;
 }
 
-static void i8259_mask_and_ack_irq(unsigned int irq_nr)
+static void i8259_mask_and_ack_irq(struct irq_data *d)
 {
        unsigned long flags;
 
        raw_spin_lock_irqsave(&i8259_lock, flags);
-       if (irq_nr > 7) {
-               cached_A1 |= 1 << (irq_nr-8);
+       if (d->irq > 7) {
+               cached_A1 |= 1 << (d->irq-8);
                inb(0xA1);      /* DUMMY */
                outb(cached_A1, 0xA1);
                outb(0x20, 0xA0);       /* Non-specific EOI */
                outb(0x20, 0x20);       /* Non-specific EOI to cascade */
        } else {
-               cached_21 |= 1 << irq_nr;
+               cached_21 |= 1 << d->irq;
                inb(0x21);      /* DUMMY */
                outb(cached_21, 0x21);
                outb(0x20, 0x20);       /* Non-specific EOI */
@@ -104,42 +104,42 @@ static void i8259_set_irq_mask(int irq_nr)
        outb(cached_21,0x21);
 }
 
-static void i8259_mask_irq(unsigned int irq_nr)
+static void i8259_mask_irq(struct irq_data *d)
 {
        unsigned long flags;
 
-       pr_debug("i8259_mask_irq(%d)\n", irq_nr);
+       pr_debug("i8259_mask_irq(%d)\n", d->irq);
 
        raw_spin_lock_irqsave(&i8259_lock, flags);
-       if (irq_nr < 8)
-               cached_21 |= 1 << irq_nr;
+       if (d->irq < 8)
+               cached_21 |= 1 << d->irq;
        else
-               cached_A1 |= 1 << (irq_nr-8);
-       i8259_set_irq_mask(irq_nr);
+               cached_A1 |= 1 << (d->irq-8);
+       i8259_set_irq_mask(d->irq);
        raw_spin_unlock_irqrestore(&i8259_lock, flags);
 }
 
-static void i8259_unmask_irq(unsigned int irq_nr)
+static void i8259_unmask_irq(struct irq_data *d)
 {
        unsigned long flags;
 
-       pr_debug("i8259_unmask_irq(%d)\n", irq_nr);
+       pr_debug("i8259_unmask_irq(%d)\n", d->irq);
 
        raw_spin_lock_irqsave(&i8259_lock, flags);
-       if (irq_nr < 8)
-               cached_21 &= ~(1 << irq_nr);
+       if (d->irq < 8)
+               cached_21 &= ~(1 << d->irq);
        else
-               cached_A1 &= ~(1 << (irq_nr-8));
-       i8259_set_irq_mask(irq_nr);
+               cached_A1 &= ~(1 << (d->irq-8));
+       i8259_set_irq_mask(d->irq);
        raw_spin_unlock_irqrestore(&i8259_lock, flags);
 }
 
 static struct irq_chip i8259_pic = {
        .name           = "i8259",
-       .mask           = i8259_mask_irq,
-       .disable        = i8259_mask_irq,
-       .unmask         = i8259_unmask_irq,
-       .mask_ack       = i8259_mask_and_ack_irq,
+       .irq_mask       = i8259_mask_irq,
+       .irq_disable    = i8259_mask_irq,
+       .irq_unmask     = i8259_unmask_irq,
+       .irq_mask_ack   = i8259_mask_and_ack_irq,
 };
 
 static struct resource pic1_iores = {
@@ -188,7 +188,7 @@ static int i8259_host_map(struct irq_host *h, unsigned int virq,
 static void i8259_host_unmap(struct irq_host *h, unsigned int virq)
 {
        /* Make sure irq is masked in hardware */
-       i8259_mask_irq(virq);
+       i8259_mask_irq(irq_get_irq_data(virq));
 
        /* remove chip and handler */
        set_irq_chip_and_handler(virq, NULL, NULL);