Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / plat-orion / irq.c

diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c
index 3f9d34fc738ca950bca1355d3042ede89e46ac42..7d0c7eb59f0971cc273aebfd1f24ba0a80684d99 100644 (file)
--- a/arch/arm/plat-orion/irq.c
+++ b/arch/arm/plat-orion/irq.c
@@ -14,31 +14,31 @@
 #include <linux/io.h>
 #include <plat/irq.h>
 
-static void orion_irq_mask(u32 irq)
+static void orion_irq_mask(struct irq_data *d)
 {
-       void __iomem *maskaddr = get_irq_chip_data(irq);
+       void __iomem *maskaddr = irq_data_get_irq_chip_data(d);
        u32 mask;
 
        mask = readl(maskaddr);
-       mask &= ~(1 << (irq & 31));
+       mask &= ~(1 << (d->irq & 31));
        writel(mask, maskaddr);
 }
 
-static void orion_irq_unmask(u32 irq)
+static void orion_irq_unmask(struct irq_data *d)
 {
-       void __iomem *maskaddr = get_irq_chip_data(irq);
+       void __iomem *maskaddr = irq_data_get_irq_chip_data(d);
        u32 mask;
 
        mask = readl(maskaddr);
-       mask |= 1 << (irq & 31);
+       mask |= 1 << (d->irq & 31);
        writel(mask, maskaddr);
 }
 
 static struct irq_chip orion_irq_chip = {
        .name           = "orion_irq",
-       .mask           = orion_irq_mask,
-       .mask_ack       = orion_irq_mask,
-       .unmask         = orion_irq_unmask,
+       .irq_mask       = orion_irq_mask,
+       .irq_mask_ack   = orion_irq_mask,
+       .irq_unmask     = orion_irq_unmask,
 };
 
 void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)