Subject: [PATCH net-next-2.6] bnx2: remove cancel_work_sync() from remove_one

From: Tejun Heo <[email-masked]>
Date: Tue, 14 Dec 2010 17:09:59 +0100

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 <[email-masked]>
Cc: Michael Chan <[email-masked]>
---
 drivers/net/bnx2.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 5c811f3..85fc2c8 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -8393,8 +8393,6 @@ bnx2_remove_one(struct pci_dev *pdev)
 	struct net_device *dev = pci_get_drvdata(pdev);
 	struct bnx2 *bp = netdev_priv(dev);

-	cancel_work_sync(&bp->reset_task);
-
 	unregister_netdev(dev);

 	if (bp->mips_firmware)