[ARM] Remove compatibility layer for ARM irqs

set_irq_chipdata -> set_irq_chip_data
get_irq_chipdata -> get_irq_chip_data
do_level_IRQ -> handle_level_irq
do_edge_IRQ -> handle_edge_irq
do_simple_IRQ -> handle_simple_irq
irqdesc -> irq_desc
irqchip -> irq_chip

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index fbe288a8da65..074c96520246 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -195,7 +195,7 @@ static void ixp4xx_irq_unmask(unsigned int irq)
                 *IXP4XX_ICMR |= (1 << irq);
 }
 
-static struct irqchip ixp4xx_irq_chip = {
+static struct irq_chip ixp4xx_irq_chip = {
         .name           = "IXP4xx",
         .ack            = ixp4xx_irq_ack,
         .mask           = ixp4xx_irq_mask,
@@ -224,7 +224,7 @@ void __init ixp4xx_init_irq(void)
         /* Default to all level triggered */
         for(i = 0; i < NR_IRQS; i++) {
                 set_irq_chip(i, &ixp4xx_irq_chip);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID);
         }
 }