]> err.no Git - linux-2.6/commitdiff
NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()
authorJiri Kosina <jkosina@suse.cz>
Tue, 6 Feb 2007 00:29:48 +0000 (16:29 -0800)
committerJeff Garzik <jeff@garzik.org>
Wed, 7 Feb 2007 00:10:33 +0000 (19:10 -0500)
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>
drivers/net/3c59x.c

index 80bdcf8462343434fae03cb3091dade3646854ee..716a47210aa326676df0c2945e5cf9d5e072ae29 100644 (file)
@@ -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);
 }