NET: turn local_save_flags() + local_irq_disable() into local_irq_save()
authorJiri Kosina <jkosina@suse.cz>
Tue, 6 Feb 2007 00:29:49 +0000 (16:29 -0800)
committerJeff Garzik <jeff@garzik.org>
Wed, 7 Feb 2007 00:10:34 +0000 (19:10 -0500)
drivers/net/amd8111e.c::amd8111e_poll() 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/amd8111e.c

index 18896f24d407e26bbb8c3ba4fa63c42aeac1c280..9c399aaefbdd1b6b045c97fab94e28dfaef3b990 100644 (file)
@@ -1334,8 +1334,7 @@ err_no_interrupt:
 static void amd8111e_poll(struct net_device *dev)
 {
        unsigned long flags;
-       local_save_flags(flags);
-       local_irq_disable();
+       local_irq_save(flags);
        amd8111e_interrupt(0, dev);
        local_irq_restore(flags);
 }