drm: 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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Jyri Sarha <jyri.sarha@iki.fi>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Link: https://lore.kernel.org/r/75e8ba40076ad707d47e3a3670e6b23c1b8b11bc.1633874223.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index cc5b07f86346320c9380c3c32519e992cdf6dc7c..242a5fd8b93212d9481d5aec67e569d01d728d47 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -1733,7 +1733,6 @@ static void etnaviv_gpu_unbind(struct device *dev, struct device *master,
 
        DBG("%s", dev_name(gpu->dev));
 
-       flush_workqueue(gpu->wq);
        destroy_workqueue(gpu->wq);
 
        etnaviv_sched_fini(gpu);

diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index 734a209071d9e080337685ec5b49b4698450468c..4b030a00fa79da440cf466e6fd4e13498eef4b42 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -1904,7 +1904,6 @@ void msm_dsi_host_destroy(struct mipi_dsi_host *host)
        DBG("");
        dsi_tx_buf_free(msm_host);
        if (msm_host->workqueue) {
-               flush_workqueue(msm_host->workqueue);
                destroy_workqueue(msm_host->workqueue);
                msm_host->workqueue = NULL;
        }

diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c
index 6ef4bee8fa86a628a235d3c709156c2e356228b1..a68a4a1867c1d8051177166f60f9d2e86f940386 100644 (file)
--- a/drivers/gpu/drm/msm/edp/edp_ctrl.c
+++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c
@@ -1190,7 +1190,6 @@ void msm_edp_ctrl_destroy(struct edp_ctrl *ctrl)
                return;
 
        if (ctrl->workqueue) {
-               flush_workqueue(ctrl->workqueue);
                destroy_workqueue(ctrl->workqueue);
                ctrl->workqueue = NULL;
        }

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 737453b6e596646b9a530ee16a18901af83c69e8..5ba7c8f284194f614826f876db26ab1743e355ae 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -61,10 +61,8 @@ static void msm_hdmi_destroy(struct hdmi *hdmi)
         * at this point, hpd has been disabled,
         * after flush workq, it's safe to deinit hdcp
         */
-       if (hdmi->workq) {
-               flush_workqueue(hdmi->workq);
+       if (hdmi->workq)
                destroy_workqueue(hdmi->workq);
-       }
        msm_hdmi_hdcp_destroy(hdmi);
 
        if (hdmi->phy_dev) {

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index 6b03f89a98d44f67c6ababcb96cdf3203db7609e..3ddb7c710a3dde980eb9e3fcbd0b14d50359d1cd 100644 (file)
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -186,10 +186,8 @@ static void tilcdc_fini(struct drm_device *dev)
        if (priv->mmio)
                iounmap(priv->mmio);
 
-       if (priv->wq) {
-               flush_workqueue(priv->wq);
+       if (priv->wq)
                destroy_workqueue(priv->wq);
-       }
 
        dev->dev_private = NULL;
 

diff --git a/drivers/gpu/drm/vmwgfx/ttm_memory.c b/drivers/gpu/drm/vmwgfx/ttm_memory.c
index edd17c30d5a51146a797a0a5f5efb8b88e17adad..7f7fe35fc21dfc6b2dcbdfbab7dcb8d2fbc5a500 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/ttm_memory.c
+++ b/drivers/gpu/drm/vmwgfx/ttm_memory.c
@@ -468,7 +468,6 @@ void ttm_mem_global_release(struct ttm_mem_global *glob)
        struct ttm_mem_zone *zone;
        unsigned int i;
 
-       flush_workqueue(glob->swap_queue);
        destroy_workqueue(glob->swap_queue);
        glob->swap_queue = NULL;
        for (i = 0; i < glob->num_zones; ++i) {