[ARM] 4002/1: S3C24XX: leave parent IRQs unmasked

Do not bother masking/unmasking the parent IRQ
for the mulitplexed EINT irqs, as masking the
leaf seems to be fine.

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

diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index e7d2ad9..3c0ed78 100644 (file)
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -206,18 +206,6 @@ s3c_irqext_mask(unsigned int irqno)
        mask = __raw_readl(S3C24XX_EINTMASK);
        mask |= ( 1UL << irqno);
        __raw_writel(mask, S3C24XX_EINTMASK);
-
-       if (irqno <= (IRQ_EINT7 - EXTINT_OFF)) {
-               /* check to see if all need masking */
-
-               if ((mask & (0xf << 4)) == (0xf << 4)) {
-                       /* all masked, mask the parent */
-                       s3c_irq_mask(IRQ_EINT4t7);
-               }
-       } else {
-               /* todo: the same check as above for the rest of the irq regs...*/
-
-       }
 }
 
 static void
@@ -229,7 +217,6 @@ s3c_irqext_ack(unsigned int irqno)
 
        bit = 1UL << (irqno - EXTINT_OFF);
 
-
        mask = __raw_readl(S3C24XX_EINTMASK);
 
        __raw_writel(bit, S3C24XX_EINTPEND);
@@ -258,8 +245,6 @@ s3c_irqext_unmask(unsigned int irqno)
        mask = __raw_readl(S3C24XX_EINTMASK);
        mask &= ~( 1UL << irqno);
        __raw_writel(mask, S3C24XX_EINTMASK);
-
-       s3c_irq_unmask((irqno <= (IRQ_EINT7 - EXTINT_OFF)) ? IRQ_EINT4t7 : IRQ_EINT8t23);
 }
 
 int