]> err.no Git - linux-2.6/commitdiff
[PATCH] b44: s/spin_lock_irqsave/spin_lock/ in b44_interrupt
authorFrancois Romieu <romieu@fr.zoreil.com>
Mon, 7 Nov 2005 00:52:06 +0000 (01:52 +0100)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 7 Nov 2005 08:37:05 +0000 (03:37 -0500)
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>
drivers/net/b44.c

index ac223fcf9864711c4a4e53b59254e12612142884..09e1b4deae59c7c583c14c3c7af04e22b27c4862 100644 (file)
@@ -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);
@@ -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);
 }