From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 6 Feb 2007 00:29:48 +0000 (-0800)
Subject: NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()
X-Git-Tag: v2.6.21-rc1~92^2~31^2~15
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d38ff1d3d34ca9ae2a61cf98cf47530f9d51dee;p=linux-2.6

NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()

drivers/net/3c59x.c::poll_vortex() contains local_irq_disable() after
local_save_flags().  Turn it into local_irq_save().

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 80bdcf8462..716a47210a 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -792,8 +792,7 @@ static void poll_vortex(struct net_device *dev)
 {
 	struct vortex_private *vp = netdev_priv(dev);
 	unsigned long flags;
-	local_save_flags(flags);
-	local_irq_disable();
+	local_irq_save(flags);
 	(vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev);
 	local_irq_restore(flags);
 }