Commit cb8f4048 authored Dec 14, 2010 by Tejun Heo Committed by David S. Miller Dec 21, 2010

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>

parent a13c1327

drivers/net/bnx2.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8393,8 +8393,6 @@ bnx2_remove_one(struct pci_dev *pdev)
	struct net_device *dev = pci_get_drvdata(pdev);		struct net_device *dev = pci_get_drvdata(pdev);
	struct bnx2 *bp = netdev_priv(dev);		struct bnx2 *bp = netdev_priv(dev);

	cancel_work_sync(&bp->reset_task);

	unregister_netdev(dev);		unregister_netdev(dev);

	if (bp->mips_firmware)		if (bp->mips_firmware)