mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
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>
This commit is contained in:
parent
3b0be1a4f2
commit
b06ede84dd
1 changed files with 5 additions and 8 deletions
|
@ -56,18 +56,15 @@ static struct irq_chip hd64461_irq_chip = {
|
||||||
static void hd64461_irq_demux(unsigned int irq, struct irq_desc *desc)
|
static void hd64461_irq_demux(unsigned int irq, struct irq_desc *desc)
|
||||||
{
|
{
|
||||||
unsigned short intv = __raw_readw(HD64461_NIRR);
|
unsigned short intv = __raw_readw(HD64461_NIRR);
|
||||||
struct irq_desc *ext_desc;
|
|
||||||
unsigned int ext_irq = HD64461_IRQBASE;
|
unsigned int ext_irq = HD64461_IRQBASE;
|
||||||
|
|
||||||
intv &= (1 << HD64461_IRQ_NUM) - 1;
|
intv &= (1 << HD64461_IRQ_NUM) - 1;
|
||||||
|
|
||||||
while (intv) {
|
for (; intv; intv >>= 1, ext_irq++) {
|
||||||
if (intv & 1) {
|
if (!(intv & 1))
|
||||||
ext_desc = irq_desc + ext_irq;
|
continue;
|
||||||
handle_level_irq(ext_irq, ext_desc);
|
|
||||||
}
|
generic_handle_irq(ext_irq);
|
||||||
intv >>= 1;
|
|
||||||
ext_irq++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue