Commit b9c56ccb authored by Christophe JAILLET's avatar Christophe JAILLET Committed by David S. Miller

ethernet: Remove redundant 'flush_workqueue()' calls

'destroy_workqueue()' already drains the queue before destroying it, so
there is no need to flush it explicitly.

Remove the redundant 'flush_workqueue()' calls.

This was generated with coccinelle:

@@
expression E;
@@
- 	flush_workqueue(E);
	destroy_workqueue(E);
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com> #mlx*
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6213f07c
...@@ -1912,10 +1912,8 @@ static int xgbe_close(struct net_device *netdev) ...@@ -1912,10 +1912,8 @@ static int xgbe_close(struct net_device *netdev)
clk_disable_unprepare(pdata->ptpclk); clk_disable_unprepare(pdata->ptpclk);
clk_disable_unprepare(pdata->sysclk); clk_disable_unprepare(pdata->sysclk);
flush_workqueue(pdata->an_workqueue);
destroy_workqueue(pdata->an_workqueue); destroy_workqueue(pdata->an_workqueue);
flush_workqueue(pdata->dev_workqueue);
destroy_workqueue(pdata->dev_workqueue); destroy_workqueue(pdata->dev_workqueue);
set_bit(XGBE_DOWN, &pdata->dev_state); set_bit(XGBE_DOWN, &pdata->dev_state);
......
...@@ -3515,7 +3515,6 @@ static void ...@@ -3515,7 +3515,6 @@ static void
bnad_uninit(struct bnad *bnad) bnad_uninit(struct bnad *bnad)
{ {
if (bnad->work_q) { if (bnad->work_q) {
flush_workqueue(bnad->work_q);
destroy_workqueue(bnad->work_q); destroy_workqueue(bnad->work_q);
bnad->work_q = NULL; bnad->work_q = NULL;
} }
......
...@@ -490,7 +490,6 @@ void cleanup_rx_oom_poll_fn(struct net_device *netdev) ...@@ -490,7 +490,6 @@ void cleanup_rx_oom_poll_fn(struct net_device *netdev)
wq = &lio->rxq_status_wq[q_no]; wq = &lio->rxq_status_wq[q_no];
if (wq->wq) { if (wq->wq) {
cancel_delayed_work_sync(&wq->wk.work); cancel_delayed_work_sync(&wq->wk.work);
flush_workqueue(wq->wq);
destroy_workqueue(wq->wq); destroy_workqueue(wq->wq);
wq->wq = NULL; wq->wq = NULL;
} }
......
...@@ -4621,7 +4621,6 @@ static void be_destroy_err_recovery_workq(void) ...@@ -4621,7 +4621,6 @@ static void be_destroy_err_recovery_workq(void)
if (!be_err_recovery_workq) if (!be_err_recovery_workq)
return; return;
flush_workqueue(be_err_recovery_workq);
destroy_workqueue(be_err_recovery_workq); destroy_workqueue(be_err_recovery_workq);
be_err_recovery_workq = NULL; be_err_recovery_workq = NULL;
} }
......
...@@ -1519,7 +1519,6 @@ static int cgx_lmac_exit(struct cgx *cgx) ...@@ -1519,7 +1519,6 @@ static int cgx_lmac_exit(struct cgx *cgx)
int i; int i;
if (cgx->cgx_cmd_workq) { if (cgx->cgx_cmd_workq) {
flush_workqueue(cgx->cgx_cmd_workq);
destroy_workqueue(cgx->cgx_cmd_workq); destroy_workqueue(cgx->cgx_cmd_workq);
cgx->cgx_cmd_workq = NULL; cgx->cgx_cmd_workq = NULL;
} }
......
...@@ -2399,7 +2399,6 @@ static void rvu_mbox_destroy(struct mbox_wq_info *mw) ...@@ -2399,7 +2399,6 @@ static void rvu_mbox_destroy(struct mbox_wq_info *mw)
int devid; int devid;
if (mw->mbox_wq) { if (mw->mbox_wq) {
flush_workqueue(mw->mbox_wq);
destroy_workqueue(mw->mbox_wq); destroy_workqueue(mw->mbox_wq);
mw->mbox_wq = NULL; mw->mbox_wq = NULL;
} }
...@@ -2944,7 +2943,6 @@ static int rvu_register_interrupts(struct rvu *rvu) ...@@ -2944,7 +2943,6 @@ static int rvu_register_interrupts(struct rvu *rvu)
static void rvu_flr_wq_destroy(struct rvu *rvu) static void rvu_flr_wq_destroy(struct rvu *rvu)
{ {
if (rvu->flr_wq) { if (rvu->flr_wq) {
flush_workqueue(rvu->flr_wq);
destroy_workqueue(rvu->flr_wq); destroy_workqueue(rvu->flr_wq);
rvu->flr_wq = NULL; rvu->flr_wq = NULL;
} }
......
...@@ -324,7 +324,6 @@ static int cgx_lmac_event_handler_init(struct rvu *rvu) ...@@ -324,7 +324,6 @@ static int cgx_lmac_event_handler_init(struct rvu *rvu)
static void rvu_cgx_wq_destroy(struct rvu *rvu) static void rvu_cgx_wq_destroy(struct rvu *rvu)
{ {
if (rvu->cgx_evh_wq) { if (rvu->cgx_evh_wq) {
flush_workqueue(rvu->cgx_evh_wq);
destroy_workqueue(rvu->cgx_evh_wq); destroy_workqueue(rvu->cgx_evh_wq);
rvu->cgx_evh_wq = NULL; rvu->cgx_evh_wq = NULL;
} }
......
...@@ -279,7 +279,6 @@ static void otx2vf_vfaf_mbox_destroy(struct otx2_nic *vf) ...@@ -279,7 +279,6 @@ static void otx2vf_vfaf_mbox_destroy(struct otx2_nic *vf)
struct mbox *mbox = &vf->mbox; struct mbox *mbox = &vf->mbox;
if (vf->mbox_wq) { if (vf->mbox_wq) {
flush_workqueue(vf->mbox_wq);
destroy_workqueue(vf->mbox_wq); destroy_workqueue(vf->mbox_wq);
vf->mbox_wq = NULL; vf->mbox_wq = NULL;
} }
......
...@@ -2480,7 +2480,6 @@ int mlx4_multi_func_init(struct mlx4_dev *dev) ...@@ -2480,7 +2480,6 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
return 0; return 0;
err_thread: err_thread:
flush_workqueue(priv->mfunc.master.comm_wq);
destroy_workqueue(priv->mfunc.master.comm_wq); destroy_workqueue(priv->mfunc.master.comm_wq);
err_slaves: err_slaves:
while (i--) { while (i--) {
...@@ -2587,7 +2586,6 @@ void mlx4_multi_func_cleanup(struct mlx4_dev *dev) ...@@ -2587,7 +2586,6 @@ void mlx4_multi_func_cleanup(struct mlx4_dev *dev)
int i, port; int i, port;
if (mlx4_is_master(dev)) { if (mlx4_is_master(dev)) {
flush_workqueue(priv->mfunc.master.comm_wq);
destroy_workqueue(priv->mfunc.master.comm_wq); destroy_workqueue(priv->mfunc.master.comm_wq);
for (i = 0; i < dev->num_slaves; i++) { for (i = 0; i < dev->num_slaves; i++) {
for (port = 1; port <= MLX4_MAX_PORTS; port++) for (port = 1; port <= MLX4_MAX_PORTS; port++)
......
...@@ -237,7 +237,6 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr) ...@@ -237,7 +237,6 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr)
if (mdev->pndev[i]) if (mdev->pndev[i])
mlx4_en_destroy_netdev(mdev->pndev[i]); mlx4_en_destroy_netdev(mdev->pndev[i]);
flush_workqueue(mdev->workqueue);
destroy_workqueue(mdev->workqueue); destroy_workqueue(mdev->workqueue);
(void) mlx4_mr_free(dev, &mdev->mr); (void) mlx4_mr_free(dev, &mdev->mr);
iounmap(mdev->uar_map); iounmap(mdev->uar_map);
......
...@@ -1069,7 +1069,6 @@ void mlx5_fw_tracer_destroy(struct mlx5_fw_tracer *tracer) ...@@ -1069,7 +1069,6 @@ void mlx5_fw_tracer_destroy(struct mlx5_fw_tracer *tracer)
mlx5_fw_tracer_clean_saved_traces_array(tracer); mlx5_fw_tracer_clean_saved_traces_array(tracer);
mlx5_fw_tracer_free_strings_db(tracer); mlx5_fw_tracer_free_strings_db(tracer);
mlx5_fw_tracer_destroy_log_buf(tracer); mlx5_fw_tracer_destroy_log_buf(tracer);
flush_workqueue(tracer->work_queue);
destroy_workqueue(tracer->work_queue); destroy_workqueue(tracer->work_queue);
kvfree(tracer); kvfree(tracer);
} }
......
...@@ -5224,7 +5224,6 @@ void qed_iov_wq_stop(struct qed_dev *cdev, bool schedule_first) ...@@ -5224,7 +5224,6 @@ void qed_iov_wq_stop(struct qed_dev *cdev, bool schedule_first)
cancel_delayed_work_sync(&cdev->hwfns[i].iov_task); cancel_delayed_work_sync(&cdev->hwfns[i].iov_task);
} }
flush_workqueue(cdev->hwfns[i].iov_wq);
destroy_workqueue(cdev->hwfns[i].iov_wq); destroy_workqueue(cdev->hwfns[i].iov_wq);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment