Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65b984f2 authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik
Browse files

[PATCH] b44: s/spin_lock_irqsave/spin_lock/ in b44_interrupt 



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: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 3353930d

drivers/net/b44.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

}