Browse Source

sh: Fix up hp6xx build.

With the sparseirq conversion there was a stray irq_desc reference left
over, this tidies it up and brings the demuxer in line with what the
solution engine boards are doing.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Paul Mundt 15 years ago
parent
commit
b06ede84dd
1 changed files with 5 additions and 8 deletions
  1. 5 8
      arch/sh/cchips/hd6446x/hd64461.c

+ 5 - 8
arch/sh/cchips/hd6446x/hd64461.c

@@ -56,18 +56,15 @@ static struct irq_chip hd64461_irq_chip = {
 static void hd64461_irq_demux(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned short intv = __raw_readw(HD64461_NIRR);
-	struct irq_desc *ext_desc;
 	unsigned int ext_irq = HD64461_IRQBASE;
 
 	intv &= (1 << HD64461_IRQ_NUM) - 1;
 
-	while (intv) {
-		if (intv & 1) {
-			ext_desc = irq_desc + ext_irq;
-			handle_level_irq(ext_irq, ext_desc);
-		}
-		intv >>= 1;
-		ext_irq++;
+	for (; intv; intv >>= 1, ext_irq++) {
+		if (!(intv & 1))
+			continue;
+
+		generic_handle_irq(ext_irq);
 	}
 }