[PATCH] pch_gbe: don't use flush_scheduled_work()

[PATCH] pch_gbe: don't use flush_scheduled_work()

[Tejun Heo]

Directly cancel adapter->reset_task instead of using to-be-deprecated
flush_scheduled_work().

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Masayuki Ohtake <masa-korg@dsn.okisemi.com>
Cc: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
Cc: David S. Miller <davem@davemloft.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);

Re: [PATCH] pch_gbe: don't use flush_scheduled_work()

[David Miller]

From: Tejun Heo <tj@kernel.org>
Date: Mon, 24 Jan 2011 15:32:25 +0100

> Directly cancel adapter->reset_task instead of using to-be-deprecated
> flush_scheduled_work().
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>

Applied, thanks Tejun.