Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (76 commits)
  [ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
  [ARM] 4001/1: S3C24XX: shorten reboot time
  [ARM] 3983/2: remove unused argument to __bug()
  [ARM] 4000/1: Osiris: add third serial port in
  [ARM] 3999/1: RX3715: suspend to RAM support
  [ARM] 3998/1: VR1000: LED platform devices
  [ARM] 3995/1: iop13xx: add iop13xx support
  [ARM] 3968/1: iop13xx: add iop13xx_defconfig
  [ARM] Update mach-types
  [ARM] Allow gcc to optimise arm_add_memory a little more
  [ARM] 3991/1: i.MX/MX1 high resolution time source
  [ARM] 3990/1: i.MX/MX1 more precise PLL decode
  [ARM] 3986/1: H1940: suspend to RAM support
  [ARM] 3985/1: ixp4xx clocksource cleanup
  [ARM] 3984/1: ixp4xx/nslu2: Fix disk LED numbering (take 2)
  [ARM] 3994/1: ixp23xx: fix handling of pci master aborts
  [ARM] 3981/1: sched_clock for PXA2xx
  [ARM] 3980/1: extend the ARM Versatile sched_clock implementation from 32 to 63 bit
  [ARM] 3979/1: extend the SA11x0 sched_clock implementation from 32 to 63 bit period
  [ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter
  ...

4 files changed, 62 insertions, 62 deletions

diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index f3e020f2227f..09b9d1b6844c 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -160,7 +160,7 @@ void __init gic_dist_init(void __iomem *base)
          */
         for (i = 29; i < max_irq; i++) {
                 set_irq_chip(i, &gic_chip);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 80a72c75214f..cfe6f4650bc9 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -163,11 +163,11 @@ static struct locomo_dev_info locomo_devices[] = {
 #define LOCOMO_IRQ_LT_START     (IRQ_LOCOMO_LT)
 #define LOCOMO_IRQ_SPI_START    (IRQ_LOCOMO_SPI_RFR)
 
-static void locomo_handler(unsigned int irq, struct irqdesc *desc)
+static void locomo_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irqdesc *d;
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        struct irq_desc *d;
+        void __iomem *mapbase = get_irq_chip_data(irq);
 
         /* Acknowledge the parent IRQ */
         desc->chip->ack(irq);
@@ -194,7 +194,7 @@ static void locomo_ack_irq(unsigned int irq)
 
 static void locomo_mask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_ICR);
         r &= ~(0x0010 << (irq - LOCOMO_IRQ_START));
@@ -203,7 +203,7 @@ static void locomo_mask_irq(unsigned int irq)
 
 static void locomo_unmask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_ICR);
         r |= (0x0010 << (irq - LOCOMO_IRQ_START));
@@ -217,10 +217,10 @@ static struct irq_chip locomo_chip = {
         .unmask = locomo_unmask_irq,
 };
 
-static void locomo_key_handler(unsigned int irq, struct irqdesc *desc)
+static void locomo_key_handler(unsigned int irq, struct irq_desc *desc)
 {
-        struct irqdesc *d;
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        struct irq_desc *d;
+        void __iomem *mapbase = get_irq_chip_data(irq);
 
         if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {
                 d = irq_desc + LOCOMO_IRQ_KEY_START;
@@ -230,7 +230,7 @@ static void locomo_key_handler(unsigned int irq, struct irqdesc *desc)
 
 static void locomo_key_ack_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
         r &= ~(0x0100 << (irq - LOCOMO_IRQ_KEY_START));
@@ -239,7 +239,7 @@ static void locomo_key_ack_irq(unsigned int irq)
 
 static void locomo_key_mask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
         r &= ~(0x0010 << (irq - LOCOMO_IRQ_KEY_START));
@@ -248,7 +248,7 @@ static void locomo_key_mask_irq(unsigned int irq)
 
 static void locomo_key_unmask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
         r |= (0x0010 << (irq - LOCOMO_IRQ_KEY_START));
@@ -262,11 +262,11 @@ static struct irq_chip locomo_key_chip = {
         .unmask = locomo_key_unmask_irq,
 };
 
-static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc)
+static void locomo_gpio_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irqdesc *d;
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        struct irq_desc *d;
+        void __iomem *mapbase = get_irq_chip_data(irq);
 
         req =   locomo_readl(mapbase + LOCOMO_GIR) &
                 locomo_readl(mapbase + LOCOMO_GPD) &
@@ -285,7 +285,7 @@ static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc)
 
 static void locomo_gpio_ack_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_GWE);
         r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -302,7 +302,7 @@ static void locomo_gpio_ack_irq(unsigned int irq)
 
 static void locomo_gpio_mask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_GIE);
         r &= ~(0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -311,7 +311,7 @@ static void locomo_gpio_mask_irq(unsigned int irq)
 
 static void locomo_gpio_unmask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_GIE);
         r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -325,10 +325,10 @@ static struct irq_chip locomo_gpio_chip = {
         .unmask = locomo_gpio_unmask_irq,
 };
 
-static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc)
+static void locomo_lt_handler(unsigned int irq, struct irq_desc *desc)
 {
-        struct irqdesc *d;
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        struct irq_desc *d;
+        void __iomem *mapbase = get_irq_chip_data(irq);
 
         if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {
                 d = irq_desc + LOCOMO_IRQ_LT_START;
@@ -338,7 +338,7 @@ static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc)
 
 static void locomo_lt_ack_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_LTINT);
         r &= ~(0x0100 << (irq - LOCOMO_IRQ_LT_START));
@@ -347,7 +347,7 @@ static void locomo_lt_ack_irq(unsigned int irq)
 
 static void locomo_lt_mask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_LTINT);
         r &= ~(0x0010 << (irq - LOCOMO_IRQ_LT_START));
@@ -356,7 +356,7 @@ static void locomo_lt_mask_irq(unsigned int irq)
 
 static void locomo_lt_unmask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_LTINT);
         r |= (0x0010 << (irq - LOCOMO_IRQ_LT_START));
@@ -370,11 +370,11 @@ static struct irq_chip locomo_lt_chip = {
         .unmask = locomo_lt_unmask_irq,
 };
 
-static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc)
+static void locomo_spi_handler(unsigned int irq, struct irq_desc *desc)
 {
         int req, i;
-        struct irqdesc *d;
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        struct irq_desc *d;
+        void __iomem *mapbase = get_irq_chip_data(irq);
 
         req = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIR) & 0x000F;
         if (req) {
@@ -391,7 +391,7 @@ static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc)
 
 static void locomo_spi_ack_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIWE);
         r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -408,7 +408,7 @@ static void locomo_spi_ack_irq(unsigned int irq)
 
 static void locomo_spi_mask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIE);
         r &= ~(0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -417,7 +417,7 @@ static void locomo_spi_mask_irq(unsigned int irq)
 
 static void locomo_spi_unmask_irq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned int r;
         r = locomo_readl(mapbase + LOCOMO_SPI + LOCOMO_SPIIE);
         r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -440,55 +440,55 @@ static void locomo_setup_irq(struct locomo *lchip)
          * Install handler for IRQ_LOCOMO_HW.
          */
         set_irq_type(lchip->irq, IRQT_FALLING);
-        set_irq_chipdata(lchip->irq, irqbase);
+        set_irq_chip_data(lchip->irq, irqbase);
         set_irq_chained_handler(lchip->irq, locomo_handler);
 
         /* Install handlers for IRQ_LOCOMO_*_BASE */
         set_irq_chip(IRQ_LOCOMO_KEY_BASE, &locomo_chip);
-        set_irq_chipdata(IRQ_LOCOMO_KEY_BASE, irqbase);
+        set_irq_chip_data(IRQ_LOCOMO_KEY_BASE, irqbase);
         set_irq_chained_handler(IRQ_LOCOMO_KEY_BASE, locomo_key_handler);
         set_irq_flags(IRQ_LOCOMO_KEY_BASE, IRQF_VALID | IRQF_PROBE);
 
         set_irq_chip(IRQ_LOCOMO_GPIO_BASE, &locomo_chip);
-        set_irq_chipdata(IRQ_LOCOMO_GPIO_BASE, irqbase);
+        set_irq_chip_data(IRQ_LOCOMO_GPIO_BASE, irqbase);
         set_irq_chained_handler(IRQ_LOCOMO_GPIO_BASE, locomo_gpio_handler);
         set_irq_flags(IRQ_LOCOMO_GPIO_BASE, IRQF_VALID | IRQF_PROBE);
 
         set_irq_chip(IRQ_LOCOMO_LT_BASE, &locomo_chip);
-        set_irq_chipdata(IRQ_LOCOMO_LT_BASE, irqbase);
+        set_irq_chip_data(IRQ_LOCOMO_LT_BASE, irqbase);
         set_irq_chained_handler(IRQ_LOCOMO_LT_BASE, locomo_lt_handler);
         set_irq_flags(IRQ_LOCOMO_LT_BASE, IRQF_VALID | IRQF_PROBE);
 
         set_irq_chip(IRQ_LOCOMO_SPI_BASE, &locomo_chip);
-        set_irq_chipdata(IRQ_LOCOMO_SPI_BASE, irqbase);
+        set_irq_chip_data(IRQ_LOCOMO_SPI_BASE, irqbase);
         set_irq_chained_handler(IRQ_LOCOMO_SPI_BASE, locomo_spi_handler);
         set_irq_flags(IRQ_LOCOMO_SPI_BASE, IRQF_VALID | IRQF_PROBE);
 
         /* install handlers for IRQ_LOCOMO_KEY_BASE generated interrupts */
         set_irq_chip(LOCOMO_IRQ_KEY_START, &locomo_key_chip);
-        set_irq_chipdata(LOCOMO_IRQ_KEY_START, irqbase);
-        set_irq_handler(LOCOMO_IRQ_KEY_START, do_edge_IRQ);
+        set_irq_chip_data(LOCOMO_IRQ_KEY_START, irqbase);
+        set_irq_handler(LOCOMO_IRQ_KEY_START, handle_edge_irq);
         set_irq_flags(LOCOMO_IRQ_KEY_START, IRQF_VALID | IRQF_PROBE);
 
         /* install handlers for IRQ_LOCOMO_GPIO_BASE generated interrupts */
         for (irq = LOCOMO_IRQ_GPIO_START; irq < LOCOMO_IRQ_GPIO_START + 16; irq++) {
                 set_irq_chip(irq, &locomo_gpio_chip);
-                set_irq_chipdata(irq, irqbase);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_chip_data(irq, irqbase);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         /* install handlers for IRQ_LOCOMO_LT_BASE generated interrupts */
         set_irq_chip(LOCOMO_IRQ_LT_START, &locomo_lt_chip);
-        set_irq_chipdata(LOCOMO_IRQ_LT_START, irqbase);
-        set_irq_handler(LOCOMO_IRQ_LT_START, do_edge_IRQ);
+        set_irq_chip_data(LOCOMO_IRQ_LT_START, irqbase);
+        set_irq_handler(LOCOMO_IRQ_LT_START, handle_edge_irq);
         set_irq_flags(LOCOMO_IRQ_LT_START, IRQF_VALID | IRQF_PROBE);
 
         /* install handlers for IRQ_LOCOMO_SPI_BASE generated interrupts */
         for (irq = LOCOMO_IRQ_SPI_START; irq < LOCOMO_IRQ_SPI_START + 3; irq++) {
                 set_irq_chip(irq, &locomo_spi_chip);
-                set_irq_chipdata(irq, irqbase);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_chip_data(irq, irqbase);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 }
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index d5f72010a6f3..fe3f05901a23 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -147,7 +147,7 @@ void __init sa1111_adjust_zones(int node, unsigned long *size, unsigned long *ho
  * will call us again if there are more interrupts to process.
  */
 static void
-sa1111_irq_handler(unsigned int irq, struct irqdesc *desc)
+sa1111_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int stat0, stat1, i;
         void __iomem *base = get_irq_data(irq);
@@ -187,7 +187,7 @@ static void sa1111_ack_irq(unsigned int irq)
 
 static void sa1111_mask_lowirq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ie0;
 
         ie0 = sa1111_readl(mapbase + SA1111_INTEN0);
@@ -197,7 +197,7 @@ static void sa1111_mask_lowirq(unsigned int irq)
 
 static void sa1111_unmask_lowirq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ie0;
 
         ie0 = sa1111_readl(mapbase + SA1111_INTEN0);
@@ -215,7 +215,7 @@ static void sa1111_unmask_lowirq(unsigned int irq)
 static int sa1111_retrigger_lowirq(unsigned int irq)
 {
         unsigned int mask = SA1111_IRQMASK_LO(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip0;
         int i;
 
@@ -236,7 +236,7 @@ static int sa1111_retrigger_lowirq(unsigned int irq)
 static int sa1111_type_lowirq(unsigned int irq, unsigned int flags)
 {
         unsigned int mask = SA1111_IRQMASK_LO(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip0;
 
         if (flags == IRQT_PROBE)
@@ -259,7 +259,7 @@ static int sa1111_type_lowirq(unsigned int irq, unsigned int flags)
 static int sa1111_wake_lowirq(unsigned int irq, unsigned int on)
 {
         unsigned int mask = SA1111_IRQMASK_LO(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long we0;
 
         we0 = sa1111_readl(mapbase + SA1111_WAKEEN0);
@@ -284,7 +284,7 @@ static struct irq_chip sa1111_low_chip = {
 
 static void sa1111_mask_highirq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ie1;
 
         ie1 = sa1111_readl(mapbase + SA1111_INTEN1);
@@ -294,7 +294,7 @@ static void sa1111_mask_highirq(unsigned int irq)
 
 static void sa1111_unmask_highirq(unsigned int irq)
 {
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ie1;
 
         ie1 = sa1111_readl(mapbase + SA1111_INTEN1);
@@ -312,7 +312,7 @@ static void sa1111_unmask_highirq(unsigned int irq)
 static int sa1111_retrigger_highirq(unsigned int irq)
 {
         unsigned int mask = SA1111_IRQMASK_HI(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip1;
         int i;
 
@@ -333,7 +333,7 @@ static int sa1111_retrigger_highirq(unsigned int irq)
 static int sa1111_type_highirq(unsigned int irq, unsigned int flags)
 {
         unsigned int mask = SA1111_IRQMASK_HI(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long ip1;
 
         if (flags == IRQT_PROBE)
@@ -356,7 +356,7 @@ static int sa1111_type_highirq(unsigned int irq, unsigned int flags)
 static int sa1111_wake_highirq(unsigned int irq, unsigned int on)
 {
         unsigned int mask = SA1111_IRQMASK_HI(irq);
-        void __iomem *mapbase = get_irq_chipdata(irq);
+        void __iomem *mapbase = get_irq_chip_data(irq);
         unsigned long we1;
 
         we1 = sa1111_readl(mapbase + SA1111_WAKEEN1);
@@ -410,15 +410,15 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
 
         for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) {
                 set_irq_chip(irq, &sa1111_low_chip);
-                set_irq_chipdata(irq, irqbase);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_chip_data(irq, irqbase);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {
                 set_irq_chip(irq, &sa1111_high_chip);
-                set_irq_chipdata(irq, irqbase);
-                set_irq_handler(irq, do_edge_IRQ);
+                set_irq_chip_data(irq, irqbase);
+                set_irq_handler(irq, handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 43d278134521..c026fa2214a3 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -27,14 +27,14 @@
 
 static void vic_mask_irq(unsigned int irq)
 {
-        void __iomem *base = get_irq_chipdata(irq);
+        void __iomem *base = get_irq_chip_data(irq);
         irq &= 31;
         writel(1 << irq, base + VIC_INT_ENABLE_CLEAR);
 }
 
 static void vic_unmask_irq(unsigned int irq)
 {
-        void __iomem *base = get_irq_chipdata(irq);
+        void __iomem *base = get_irq_chip_data(irq);
         irq &= 31;
         writel(1 << irq, base + VIC_INT_ENABLE);
 }
@@ -88,10 +88,10 @@ void __init vic_init(void __iomem *base, unsigned int irq_start,
                 unsigned int irq = irq_start + i;
 
                 set_irq_chip(irq, &vic_chip);
-                set_irq_chipdata(irq, base);
+                set_irq_chip_data(irq, base);
 
                 if (vic_sources & (1 << i)) {
-                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_handler(irq, handle_level_irq);
                         set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
                 }
         }