aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2005-11-06 19:52:06 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-07 03:37:05 -0500
commit65b984f26f16e97168ee29e53145055412f38a23 (patch)
treeece6ca6ed3844220c92e4b1207542864f70bad39 /drivers/net
parent3353930d9d026ca94747d0766f864b2a0a8c714b (diff)
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/b44.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index ac223fcf9864..09e1b4deae59 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -895,11 +895,10 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
895{ 895{
896 struct net_device *dev = dev_id; 896 struct net_device *dev = dev_id;
897 struct b44 *bp = netdev_priv(dev); 897 struct b44 *bp = netdev_priv(dev);
898 unsigned long flags;
899 u32 istat, imask; 898 u32 istat, imask;
900 int handled = 0; 899 int handled = 0;
901 900
902 spin_lock_irqsave(&bp->lock, flags); 901 spin_lock(&bp->lock);
903 902
904 istat = br32(bp, B44_ISTAT); 903 istat = br32(bp, B44_ISTAT);
905 imask = br32(bp, B44_IMASK); 904 imask = br32(bp, B44_IMASK);
@@ -925,7 +924,7 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
925 bw32(bp, B44_ISTAT, istat); 924 bw32(bp, B44_ISTAT, istat);
926 br32(bp, B44_ISTAT); 925 br32(bp, B44_ISTAT);
927 } 926 }
928 spin_unlock_irqrestore(&bp->lock, flags); 927 spin_unlock(&bp->lock);
929 return IRQ_RETVAL(handled); 928 return IRQ_RETVAL(handled);
930} 929}
931 930