Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 29 insertions, 29 deletions

diff --git a/arch/arm/mach-bcmring/irq.c b/arch/arm/mach-bcmring/irq.c
index dc1c4939b0ce..c48feaf4e8e9 100644
--- a/arch/arm/mach-bcmring/irq.c
+++ b/arch/arm/mach-bcmring/irq.c
@@ -30,61 +30,61 @@
 #include <mach/csp/intcHw_reg.h>
 #include <mach/csp/mm_io.h>
 
-static void bcmring_mask_irq0(unsigned int irq)
+static void bcmring_mask_irq0(struct irq_data *d)
 {
-        writel(1 << (irq - IRQ_INTC0_START),
+        writel(1 << (d->irq - IRQ_INTC0_START),
                MM_IO_BASE_INTC0 + INTCHW_INTENCLEAR);
 }
 
-static void bcmring_unmask_irq0(unsigned int irq)
+static void bcmring_unmask_irq0(struct irq_data *d)
 {
-        writel(1 << (irq - IRQ_INTC0_START),
+        writel(1 << (d->irq - IRQ_INTC0_START),
                MM_IO_BASE_INTC0 + INTCHW_INTENABLE);
 }
 
-static void bcmring_mask_irq1(unsigned int irq)
+static void bcmring_mask_irq1(struct irq_data *d)
 {
-        writel(1 << (irq - IRQ_INTC1_START),
+        writel(1 << (d->irq - IRQ_INTC1_START),
                MM_IO_BASE_INTC1 + INTCHW_INTENCLEAR);
 }
 
-static void bcmring_unmask_irq1(unsigned int irq)
+static void bcmring_unmask_irq1(struct irq_data *d)
 {
-        writel(1 << (irq - IRQ_INTC1_START),
+        writel(1 << (d->irq - IRQ_INTC1_START),
                MM_IO_BASE_INTC1 + INTCHW_INTENABLE);
 }
 
-static void bcmring_mask_irq2(unsigned int irq)
+static void bcmring_mask_irq2(struct irq_data *d)
 {
-        writel(1 << (irq - IRQ_SINTC_START),
+        writel(1 << (d->irq - IRQ_SINTC_START),
                MM_IO_BASE_SINTC + INTCHW_INTENCLEAR);
 }
 
-static void bcmring_unmask_irq2(unsigned int irq)
+static void bcmring_unmask_irq2(struct irq_data *d)
 {
-        writel(1 << (irq - IRQ_SINTC_START),
+        writel(1 << (d->irq - IRQ_SINTC_START),
                MM_IO_BASE_SINTC + INTCHW_INTENABLE);
 }
 
 static struct irq_chip bcmring_irq0_chip = {
-        .typename = "ARM-INTC0",
-        .ack = bcmring_mask_irq0,
-        .mask = bcmring_mask_irq0,      /* mask a specific interrupt, blocking its delivery. */
-        .unmask = bcmring_unmask_irq0,  /* unmaks an interrupt */
+        .name = "ARM-INTC0",
+        .irq_ack = bcmring_mask_irq0,
+        .irq_mask = bcmring_mask_irq0,  /* mask a specific interrupt, blocking its delivery. */
+        .irq_unmask = bcmring_unmask_irq0,      /* unmaks an interrupt */
 };
 
 static struct irq_chip bcmring_irq1_chip = {
-        .typename = "ARM-INTC1",
-        .ack = bcmring_mask_irq1,
-        .mask = bcmring_mask_irq1,
-        .unmask = bcmring_unmask_irq1,
+        .name = "ARM-INTC1",
+        .irq_ack = bcmring_mask_irq1,
+        .irq_mask = bcmring_mask_irq1,
+        .irq_unmask = bcmring_unmask_irq1,
 };
 
 static struct irq_chip bcmring_irq2_chip = {
-        .typename = "ARM-SINTC",
-        .ack = bcmring_mask_irq2,
-        .mask = bcmring_mask_irq2,
-        .unmask = bcmring_unmask_irq2,
+        .name = "ARM-SINTC",
+        .irq_ack = bcmring_mask_irq2,
+        .irq_mask = bcmring_mask_irq2,
+        .irq_unmask = bcmring_unmask_irq2,
 };
 
 static void vic_init(void __iomem *base, struct irq_chip *chip,
@@ -93,11 +93,11 @@ static void vic_init(void __iomem *base, struct irq_chip *chip,
         unsigned int i;
         for (i = 0; i < 32; i++) {
                 unsigned int irq = irq_start + i;
-                set_irq_chip(irq, chip);
-                set_irq_chip_data(irq, base);
+                irq_set_chip(irq, chip);
+                irq_set_chip_data(irq, base);
 
                 if (vic_sources & (1 << i)) {
-                        set_irq_handler(irq, handle_level_irq);
+                        irq_set_handler(irq, handle_level_irq);
                         set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
                 }
         }
@@ -119,9 +119,9 @@ void __init bcmring_init_irq(void)
 
         /* special cases */
         if (INTCHW_INTC1_GPIO0 & IRQ_INTC1_VALID_MASK) {
-                set_irq_handler(IRQ_GPIO0, handle_simple_irq);
+                irq_set_handler(IRQ_GPIO0, handle_simple_irq);
         }
         if (INTCHW_INTC1_GPIO1 & IRQ_INTC1_VALID_MASK) {
-                set_irq_handler(IRQ_GPIO1, handle_simple_irq);
+                irq_set_handler(IRQ_GPIO1, handle_simple_irq);
         }
 }