From b7e36bfa9ffa2f6097b622ba07a95d823db553e4 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Mon, 5 Feb 2007 16:29:49 -0800 Subject: [PATCH] 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 Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik --- drivers/net/amd8111e.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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); } -- 2.20.1