pch_gbe: don't use flush_scheduled_work()
authorTejun Heo <tj@kernel.org>
Tue, 25 Jan 2011 07:19:10 +0000 (23:19 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Jan 2011 07:19:10 +0000 (23:19 -0800)
Directly cancel adapter->reset_task instead of using to-be-deprecated
flush_scheduled_work().

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/pch_gbe/pch_gbe_main.c

index d7355306a738fbbe78b7848423ea203a6fd5c444..1bf12339441bb5887a4cfaf2c81abea647a41923 100644 (file)
@@ -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);