浏览代码

[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: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Francois Romieu 19 年之前
父节点
当前提交
65b984f26f
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      drivers/net/b44.c

+ 2 - 3
drivers/net/b44.c

@@ -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 net_device *dev = dev_id;
 	struct b44 *bp = netdev_priv(dev);
 	struct b44 *bp = netdev_priv(dev);
-	unsigned long flags;
 	u32 istat, imask;
 	u32 istat, imask;
 	int handled = 0;
 	int handled = 0;
 
 
-	spin_lock_irqsave(&bp->lock, flags);
+	spin_lock(&bp->lock);
 
 
 	istat = br32(bp, B44_ISTAT);
 	istat = br32(bp, B44_ISTAT);
 	imask = br32(bp, B44_IMASK);
 	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);
 		bw32(bp, B44_ISTAT, istat);
 		br32(bp, B44_ISTAT);
 		br32(bp, B44_ISTAT);
 	}
 	}
-	spin_unlock_irqrestore(&bp->lock, flags);
+	spin_unlock(&bp->lock);
 	return IRQ_RETVAL(handled);
 	return IRQ_RETVAL(handled);
 }
 }