diff options
author | Jiri Kosina <jkosina@suse.cz> | 2007-02-05 19:29:49 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-06 19:10:34 -0500 |
commit | b7e36bfa9ffa2f6097b622ba07a95d823db553e4 (patch) | |
tree | 7d57e7af0b9ecb3eb75b86b15e6c59bc8d6b7545 /drivers | |
parent | 0d38ff1d3d34ca9ae2a61cf98cf47530f9d51dee (diff) |
NET: turn local_save_flags() + local_irq_disable() into local_irq_save()
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/amd8111e.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 18896f24d407..9c399aaefbdd 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -1334,8 +1334,7 @@ err_no_interrupt: | |||
1334 | static void amd8111e_poll(struct net_device *dev) | 1334 | static void amd8111e_poll(struct net_device *dev) |
1335 | { | 1335 | { |
1336 | unsigned long flags; | 1336 | unsigned long flags; |
1337 | local_save_flags(flags); | 1337 | local_irq_save(flags); |
1338 | local_irq_disable(); | ||
1339 | amd8111e_interrupt(0, dev); | 1338 | amd8111e_interrupt(0, dev); |
1340 | local_irq_restore(flags); | 1339 | local_irq_restore(flags); |
1341 | } | 1340 | } |