forked from luck/tmp_suning_uos_patched
[MIPS] Alchemy: replace ffs() with __ffs()
Fix havoc wrought by commit 56f621c7f6
--
au_ffs() and ffs() are equivalent, that patch should have just replaced one
with another. Now replace ffs() with __ffs() which returns an unbiased bit
number.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
f435a91e66
commit
4b36673284
|
@ -859,7 +859,7 @@ dbdma_interrupt(int irq, void *dev_id)
|
|||
|
||||
intstat = dbdma_gptr->ddma_intstat;
|
||||
au_sync();
|
||||
chan_index = ffs(intstat);
|
||||
chan_index = __ffs(intstat);
|
||||
|
||||
ctp = chan_tab_ptr[chan_index];
|
||||
cp = ctp->chan_ptr;
|
||||
|
|
|
@ -462,7 +462,7 @@ static void intc0_req0_irqdispatch(void)
|
|||
return;
|
||||
}
|
||||
#endif
|
||||
bit = ffs(intc0_req0);
|
||||
bit = __ffs(intc0_req0);
|
||||
intc0_req0 &= ~(1 << bit);
|
||||
do_IRQ(MIPS_CPU_IRQ_BASE + bit);
|
||||
}
|
||||
|
@ -478,7 +478,7 @@ static void intc0_req1_irqdispatch(void)
|
|||
if (!intc0_req1)
|
||||
return;
|
||||
|
||||
bit = ffs(intc0_req1);
|
||||
bit = __ffs(intc0_req1);
|
||||
intc0_req1 &= ~(1 << bit);
|
||||
do_IRQ(bit);
|
||||
}
|
||||
|
@ -498,7 +498,7 @@ static void intc1_req0_irqdispatch(void)
|
|||
if (!intc1_req0)
|
||||
return;
|
||||
|
||||
bit = ffs(intc1_req0);
|
||||
bit = __ffs(intc1_req0);
|
||||
intc1_req0 &= ~(1 << bit);
|
||||
do_IRQ(MIPS_CPU_IRQ_BASE + 32 + bit);
|
||||
}
|
||||
|
@ -514,7 +514,7 @@ static void intc1_req1_irqdispatch(void)
|
|||
if (!intc1_req1)
|
||||
return;
|
||||
|
||||
bit = ffs(intc1_req1);
|
||||
bit = __ffs(intc1_req1);
|
||||
intc1_req1 &= ~(1 << bit);
|
||||
do_IRQ(MIPS_CPU_IRQ_BASE + 32 + bit);
|
||||
}
|
||||
|
|
|
@ -74,7 +74,7 @@ irqreturn_t pb1200_cascade_handler( int irq, void *dev_id)
|
|||
bcsr->int_status = bisr;
|
||||
for( ; bisr; bisr &= (bisr-1) )
|
||||
{
|
||||
extirq_nr = PB1200_INT_BEGIN + ffs(bisr);
|
||||
extirq_nr = PB1200_INT_BEGIN + __ffs(bisr);
|
||||
/* Ack and dispatch IRQ */
|
||||
do_IRQ(extirq_nr);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user