aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-14 01:09:59 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-21 15:20:47 -0500
commitcb8f404893bab40431f7eeb2511454031b07e7df (patch)
tree8def8bda0f66bc70cae163f945e039bd9b3dbc8c /drivers/net/bnx2.c
parenta13c13273a206e0c4b9a814277fb50529457abe7 (diff)
bnx2: remove cancel_work_sync() from remove_one
Michael pointed out that bnx2_close() already cancels bp->reset_task and thus it is guaranteed to be idle when bnx2_remove_one() is called. Remove the unnecessary cancel_work_sync() in remove_one. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r--drivers/net/bnx2.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 5c811f3fa11a..85fc2c88af8e 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -8393,8 +8393,6 @@ bnx2_remove_one(struct pci_dev *pdev)
8393 struct net_device *dev = pci_get_drvdata(pdev); 8393 struct net_device *dev = pci_get_drvdata(pdev);
8394 struct bnx2 *bp = netdev_priv(dev); 8394 struct bnx2 *bp = netdev_priv(dev);
8395 8395
8396 cancel_work_sync(&bp->reset_task);
8397
8398 unregister_netdev(dev); 8396 unregister_netdev(dev);
8399 8397
8400 if (bp->mips_firmware) 8398 if (bp->mips_firmware)