From: Tejun Heo Date: Tue, 25 Jan 2011 07:19:10 +0000 (-0800) Subject: pch_gbe: don't use flush_scheduled_work() X-Git-Tag: v3.12-rc1~7141^2~118 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2321f3b4afc7c017f34b0cad0624b3b9ebdf2ba4;p=kernel%2Fkernel-generic.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c index d735530..1bf1233 100644 --- a/drivers/net/pch_gbe/pch_gbe_main.c +++ b/drivers/net/pch_gbe/pch_gbe_main.c @@ -2247,7 +2247,7 @@ static void pch_gbe_remove(struct pci_dev *pdev) 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);