diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 03:45:14 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 03:45:14 -0500 |
| commit | b06ede84dd1473dec7c6af03a41c8d04d2fee437 (patch) | |
| tree | 17d93f51909ef0d43354877e83da7542cf83e3eb | |
| parent | 3b0be1a4f2f7d8280574aa6e5eac2dd3dd57e2b7 (diff) | |
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>
| -rw-r--r-- | arch/sh/cchips/hd6446x/hd64461.c | 13 |
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 = { | |||
| 56 | static void hd64461_irq_demux(unsigned int irq, struct irq_desc *desc) | 56 | static void hd64461_irq_demux(unsigned int irq, struct irq_desc *desc) |
| 57 | { | 57 | { |
| 58 | unsigned short intv = __raw_readw(HD64461_NIRR); | 58 | unsigned short intv = __raw_readw(HD64461_NIRR); |
| 59 | struct irq_desc *ext_desc; | ||
| 60 | unsigned int ext_irq = HD64461_IRQBASE; | 59 | unsigned int ext_irq = HD64461_IRQBASE; |
| 61 | 60 | ||
| 62 | intv &= (1 << HD64461_IRQ_NUM) - 1; | 61 | intv &= (1 << HD64461_IRQ_NUM) - 1; |
| 63 | 62 | ||
| 64 | while (intv) { | 63 | for (; intv; intv >>= 1, ext_irq++) { |
| 65 | if (intv & 1) { | 64 | if (!(intv & 1)) |
| 66 | ext_desc = irq_desc + ext_irq; | 65 | continue; |
| 67 | handle_level_irq(ext_irq, ext_desc); | 66 | |
| 68 | } | 67 | generic_handle_irq(ext_irq); |
| 69 | intv >>= 1; | ||
| 70 | ext_irq++; | ||
| 71 | } | 68 | } |
| 72 | } | 69 | } |
| 73 | 70 | ||
