Skip to content

Commit

Permalink
pch_gbe: don't use flush_scheduled_work()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tejun Heo authored and David S. Miller committed Jan 25, 2011
1 parent 7c81047 commit 2321f3b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/pch_gbe/pch_gbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 2321f3b

Please sign in to comment.