summaryrefslogtreecommitdiffstats
path: root/arch/sh/cchips
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-02-05 17:45:14 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-02-05 17:45:14 +0900
commitb06ede84dd1473dec7c6af03a41c8d04d2fee437 (patch)
tree17d93f51909ef0d43354877e83da7542cf83e3eb /arch/sh/cchips
parent3b0be1a4f2f7d8280574aa6e5eac2dd3dd57e2b7 (diff)
downloadlinux-b06ede84dd1473dec7c6af03a41c8d04d2fee437.tar.bz2
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>
Diffstat (limited to 'arch/sh/cchips')
-rw-r--r--arch/sh/cchips/hd6446x/hd64461.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/sh/cchips/hd6446x/hd64461.c b/arch/sh/cchips/hd6446x/hd64461.c
index b447091fc064..bcb31ae84a51 100644
--- a/arch/sh/cchips/hd6446x/hd64461.c
+++ b/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);
}
}