Skip to content

Commit

Permalink
[PATCH] b44: s/spin_lock_irqsave/spin_lock/ in b44_interrupt
Browse files Browse the repository at this point in the history
There is no need to save/restore the irq state as the irq are always
locally disabled when b44_interrupt is issued.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  • Loading branch information
Francois Romieu authored and Jeff Garzik committed Nov 7, 2005
1 parent 3353930 commit 65b984f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/net/b44.c
Original file line number Diff line number Diff line change
Expand Up @@ -895,11 +895,10 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
struct net_device *dev = dev_id;
struct b44 *bp = netdev_priv(dev);
unsigned long flags;
u32 istat, imask;
int handled = 0;

spin_lock_irqsave(&bp->lock, flags);
spin_lock(&bp->lock);

istat = br32(bp, B44_ISTAT);
imask = br32(bp, B44_IMASK);
Expand All @@ -925,7 +924,7 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
bw32(bp, B44_ISTAT, istat);
br32(bp, B44_ISTAT);
}
spin_unlock_irqrestore(&bp->lock, flags);
spin_unlock(&bp->lock);
return IRQ_RETVAL(handled);
}

Expand Down

0 comments on commit 65b984f

Please sign in to comment.