]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
bnx2: remove cancel_work_sync() from remove_one
authorTejun Heo <tj@kernel.org>
Tue, 14 Dec 2010 06:09:59 +0000 (06:09 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Dec 2010 20:20:47 +0000 (12:20 -0800)
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>
drivers/net/bnx2.c

index 5c811f3fa11abbbe59789bed4650a4ca41019710..85fc2c88af8e432d984602cc7230f50229a13e9a 100644 (file)
@@ -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)