REMOVE OMAP LEGACY CODE: Reset clocks and PM code to mainline

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / irq.c

diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index b44dcaeef738b06140a54437dee4dc91a67a1b77..9ba20d985dda252f5a38bb54f478d543454e4599 100644 (file)
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -123,11 +123,6 @@ static void omap_unmask_irq(unsigned int irq)
        intc_bank_write_reg(1 << irq, &irq_banks[0], INTC_MIR_CLEAR0 + offset);
 }
 
-static void omap_disable_irq(unsigned int irq)
-{
-       omap_mask_irq(irq);
-}
-
 static void omap_mask_ack_irq(unsigned int irq)
 {
        omap_mask_irq(irq);
@@ -139,7 +134,7 @@ static struct irq_chip omap_irq_chip = {
        .ack    = omap_mask_ack_irq,
        .mask   = omap_mask_irq,
        .unmask = omap_unmask_irq,
-       .disable = omap_disable_irq,
+       .disable = omap_mask_irq,
 };
 
 static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank)
@@ -162,26 +157,6 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank)
        intc_bank_write_reg(1 << 0, bank, INTC_SYSCONFIG);
 }
 
-int omap_irq_pending(void)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(irq_banks); i++) {
-               struct omap_irq_bank *bank = irq_banks + i;
-               int irq;
-
-               for (irq = 0; irq < bank->nr_irqs; irq += IRQ_BITS_PER_REG) {
-                       int offset = irq & (~(IRQ_BITS_PER_REG - 1));
-
-                       if (intc_bank_read_reg(bank, (INTC_PENDING_IRQ0 +
-                                                     offset)))
-                               return 1;
-               }
-       }
-
-       return 0;
-}
-
 void __init omap_init_irq(void)
 {
        unsigned long nr_of_irqs = 0;