[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110124143225.GF11404@htj.dyndns.org>
Date: Mon, 24 Jan 2011 15:32:25 +0100
From: Tejun Heo <tj@...nel.org>
To: linux-kernel@...r.kernel.org,
"David S. Miller" <davem@...emloft.net>
Cc: Masayuki Ohtake <masa-korg@....okisemi.com>,
Toshiharu Okada <toshiharu-linux@....okisemi.com>
Subject: [PATCH] pch_gbe: don't use flush_scheduled_work()
Directly cancel adapter->reset_task instead of using to-be-deprecated
flush_scheduled_work().
Signed-off-by: Tejun Heo <tj@...nel.org>
Cc: Masayuki Ohtake <masa-korg@....okisemi.com>
Cc: Toshiharu Okada <toshiharu-linux@....okisemi.com>
Cc: David S. Miller <davem@...emloft.net>
---
drivers/net/pch_gbe/pch_gbe_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: work/drivers/net/pch_gbe/pch_gbe_main.c
===================================================================
--- work.orig/drivers/net/pch_gbe/pch_gbe_main.c
+++ work/drivers/net/pch_gbe/pch_gbe_main.c
@@ -2247,7 +2247,7 @@ static void pch_gbe_remove(struct pci_de
struct net_device *netdev = pci_get_drvdata(pdev);
struct pch_gbe_adapter *adapter = netdev_priv(netdev);
- flush_scheduled_work();
+ cancel_work_sync(&adapter->reset_task);
unregister_netdev(netdev);
pch_gbe_hal_phy_hw_reset(&adapter->hw);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists