diff options
| author |   Tejun Heo <tj@kernel.org> | 2010-12-14 06:09:59 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-12-21 12:20:47 -0800 |
| commit | cb8f404893bab40431f7eeb2511454031b07e7df (patch) | |
| tree | 8def8bda0f66bc70cae163f945e039bd9b3dbc8c /drivers/net/bnx2.c | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 (diff) | |
| download | linux-dev-cb8f404893bab40431f7eeb2511454031b07e7df.tar.xz linux-dev-cb8f404893bab40431f7eeb2511454031b07e7df.zip | |
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.c | 2 |
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) 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) |