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

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>
---

diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 18896f24d4..9c399aaefb 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -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);
 }