[Freedreno] [PATCH 5/6] drm/msm: dpu: Remove empty/useless labels
Jeykumar Sankaran
jsanka at codeaurora.org
Mon Oct 8 22:30:41 UTC 2018
On 2018-10-08 15:24, Jeykumar Sankaran wrote:
> On 2018-09-20 07:58, Sean Paul wrote:
>> From: Sean Paul <seanpaul at chromium.org>
>>
>> I noticed an empty label while driving by and decided to use
>> coccinelle to see if there were any more. Here's the spatch and the
>> invocation:
>>
>> ---
>>
>> @@
>> identifier lbl;
>> expression E;
>> @@
>>
>> - goto lbl;
>> + return E;
>> ...
>> - lbl:
>> return E;
>>
>> @@
>> identifier lbl;
>> @@
>>
>> - goto lbl;
>> + return;
>> ...
>> - lbl:
>> - return;
>>
>> ---
>> spatch --allow-inconsistent-paths --sp-file file.spatch --dir
>> drivers/gpu/drm/msm/disp/dpu1 --in-place
>> ---
>>
>> Signed-off-by: Sean Paul <seanpaul at chromium.org>
Reviewed-by: Jeykumar Sankaran <jsanka at codeaurora.org>
>> ---
>> drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 5 ++---
>> .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 8 ++------
>> drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 5 ++---
>> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 +--
>> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 15
>> ++++++---------
>> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 14 ++++++--------
>> drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 4 +---
>> 7 files changed, 20 insertions(+), 34 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
>> index 41c5191f9056..affc9738e2b5 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
>> @@ -68,7 +68,7 @@ static bool
>> _dpu_core_video_mode_intf_connected(struct
>> drm_crtc *crtc)
>> bool intf_connected = false;
>>
>> if (!crtc)
>> - goto end;
>> + return intf_connected;
> This can be further cleaned up by removing this intermediate var.
Nevermind. Just checked patch 6/6.
>>
>> drm_for_each_crtc(tmp_crtc, crtc->dev) {
>> if ((dpu_crtc_get_intf_mode(tmp_crtc) == INTF_MODE_VIDEO)
>> &&
>> @@ -76,11 +76,10 @@ static bool
>> _dpu_core_video_mode_intf_connected(struct
>> drm_crtc *crtc)
>> DPU_DEBUG("video interface connected crtc:%d\n",
>> tmp_crtc->base.id);
>> intf_connected = true;
>> - goto end;
>> + return intf_connected;
>> }
>> }
>>
>> -end:
>> return intf_connected;
>> }
>>
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
>> index c30ae05b3349..24a98f4e1f44 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
>> @@ -496,14 +496,11 @@ static void dpu_encoder_phys_cmd_enable_helper(
>> _dpu_encoder_phys_cmd_pingpong_config(phys_enc);
>>
>> if (!dpu_encoder_phys_cmd_is_master(phys_enc))
>> - goto skip_flush;
>> + return;
>>
>> ctl = phys_enc->hw_ctl;
>> ctl->ops.get_bitmask_intf(ctl, &flush_mask, phys_enc->intf_idx);
>> ctl->ops.update_pending_flush(ctl, flush_mask);
>> -
>> -skip_flush:
>> - return;
>> }
>>
>> static void dpu_encoder_phys_cmd_enable(struct dpu_encoder_phys
>> *phys_enc)
>> @@ -797,7 +794,7 @@ struct dpu_encoder_phys
>> *dpu_encoder_phys_cmd_init(
>> if (!cmd_enc) {
>> ret = -ENOMEM;
>> DPU_ERROR("failed to allocate\n");
>> - goto fail;
>> + return ERR_PTR(ret);
>> }
>> phys_enc = &cmd_enc->base;
>> phys_enc->hw_mdptop = p->dpu_kms->hw_mdp;
>> @@ -855,6 +852,5 @@ struct dpu_encoder_phys
>> *dpu_encoder_phys_cmd_init(
>>
>> return phys_enc;
>>
>> -fail:
>> return ERR_PTR(ret);
>> }
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
>> index bfcd165e96df..0aa9b8e1ae70 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
>> @@ -921,7 +921,7 @@ static int _dpu_format_populate_addrs_ubwc(
>> + layout->plane_size[2] + layout->plane_size[3];
>>
>> if (!meta)
>> - goto done;
>> + return 0;
>>
>> /* configure Y metadata plane */
>> layout->plane_addr[2] = base_addr;
>> @@ -952,12 +952,11 @@ static int _dpu_format_populate_addrs_ubwc(
>> layout->plane_addr[1] = 0;
>>
>> if (!meta)
>> - goto done;
>> + return 0;
>>
>> layout->plane_addr[2] = base_addr;
>> layout->plane_addr[3] = 0;
>> }
>> -done:
>> return 0;
>> }
>>
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> index cc3a623903f4..52fca13da176 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> @@ -177,7 +177,7 @@ static u32 dpu_hw_pp_get_line_count(struct
>> dpu_hw_pingpong *pp)
>> height = DPU_REG_READ(c, PP_SYNC_CONFIG_HEIGHT) & 0xFFFF;
>>
>> if (height < init)
>> - goto line_count_exit;
>> + return line;
>>
>> line = DPU_REG_READ(c, PP_INT_COUNT_VAL) & 0xFFFF;
>>
>> @@ -186,7 +186,6 @@ static u32 dpu_hw_pp_get_line_count(struct
>> dpu_hw_pingpong *pp)
>> else
>> line -= init;
>>
>> -line_count_exit:
>> return line;
>> }
>>
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
>> index 0a683e65a9f3..d51992014e41 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
>> @@ -979,20 +979,20 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
>>
>> if (!kms) {
>> DPU_ERROR("invalid kms\n");
>> - goto end;
>> + return rc;
>> }
>>
>> dpu_kms = to_dpu_kms(kms);
>> dev = dpu_kms->dev;
>> if (!dev) {
>> DPU_ERROR("invalid device\n");
>> - goto end;
>> + return rc;
>> }
>>
>> rc = dpu_dbg_init(&dpu_kms->pdev->dev);
>> if (rc) {
>> DRM_ERROR("failed to init dpu dbg: %d\n", rc);
>> - goto end;
>> + return rc;
>> }
>>
>> priv = dev->dev_private;
>> @@ -1173,7 +1173,6 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
>> _dpu_kms_hw_destroy(dpu_kms);
>> dbg_destroy:
>> dpu_dbg_destroy();
>> -end:
>> return rc;
>> }
>>
>> @@ -1278,7 +1277,7 @@ static int __maybe_unused
>> dpu_runtime_suspend(struct
>> device *dev)
>> ddev = dpu_kms->dev;
>> if (!ddev) {
>> DPU_ERROR("invalid drm_device\n");
>> - goto exit;
>> + return rc;
>> }
>>
>> rc = dpu_power_resource_enable(&dpu_kms->phandle,
>> @@ -1290,7 +1289,6 @@ static int __maybe_unused
>> dpu_runtime_suspend(struct
>> device *dev)
>> if (rc)
>> DPU_ERROR("clock disable failed rc:%d\n", rc);
>>
>> -exit:
>> return rc;
>> }
>>
>> @@ -1305,13 +1303,13 @@ static int __maybe_unused
>> dpu_runtime_resume(struct device *dev)
>> ddev = dpu_kms->dev;
>> if (!ddev) {
>> DPU_ERROR("invalid drm_device\n");
>> - goto exit;
>> + return rc;
>> }
>>
>> rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk, true);
>> if (rc) {
>> DPU_ERROR("clock enable failed rc:%d\n", rc);
>> - goto exit;
>> + return rc;
>> }
>>
>> rc = dpu_power_resource_enable(&dpu_kms->phandle,
>> @@ -1319,7 +1317,6 @@ static int __maybe_unused
>> dpu_runtime_resume(struct
>> device *dev)
>> if (rc)
>> DPU_ERROR("resource enable failed: %d\n", rc);
>>
>> -exit:
>> return rc;
>> }
>>
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
>> index 2b23b95f4a6f..1fa0ba0019ed 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
>> @@ -432,13 +432,12 @@ int dpu_plane_danger_signal_ctrl(struct
>> drm_plane
>> *plane, bool enable)
>> pdpu = to_dpu_plane(plane);
>>
>> if (!pdpu->is_rt_pipe)
>> - goto end;
>> + return 0;
>>
>> pm_runtime_get_sync(&dpu_kms->pdev->dev);
>> _dpu_plane_set_qos_ctrl(plane, enable, DPU_PLANE_QOS_PANIC_CTRL);
>> pm_runtime_put_sync(&dpu_kms->pdev->dev);
>>
>> -end:
>> return 0;
>> }
>>
>> @@ -1744,24 +1743,24 @@ struct drm_plane *dpu_plane_init(struct
>> drm_device
>> *dev,
>>
>> if (!dev) {
>> DPU_ERROR("[%u]device is NULL\n", pipe);
>> - goto exit;
>> + return ERR_PTR(ret);
>> }
>>
>> priv = dev->dev_private;
>> if (!priv) {
>> DPU_ERROR("[%u]private data is NULL\n", pipe);
>> - goto exit;
>> + return ERR_PTR(ret);
>> }
>>
>> if (!priv->kms) {
>> DPU_ERROR("[%u]invalid KMS reference\n", pipe);
>> - goto exit;
>> + return ERR_PTR(ret);
>> }
>> kms = to_dpu_kms(priv->kms);
>>
>> if (!kms->catalog) {
>> DPU_ERROR("[%u]invalid catalog reference\n", pipe);
>> - goto exit;
>> + return ERR_PTR(ret);
>> }
>>
>> /* create and zero local structure */
>> @@ -1769,7 +1768,7 @@ struct drm_plane *dpu_plane_init(struct
>> drm_device
>> *dev,
>> if (!pdpu) {
>> DPU_ERROR("[%u]failed to allocate local plane struct\n",
>> pipe);
>> ret = -ENOMEM;
>> - goto exit;
>> + return ERR_PTR(ret);
>> }
>>
>> /* cache local stuff for later */
>> @@ -1855,6 +1854,5 @@ struct drm_plane *dpu_plane_init(struct
>> drm_device
>> *dev,
>> dpu_hw_sspp_destroy(pdpu->pipe_hw);
>> clean_plane:
>> kfree(pdpu);
>> -exit:
>> return ERR_PTR(ret);
>> }
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
>> index 295528292296..ff5091d2555d 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
>> @@ -191,7 +191,7 @@ void dpu_vbif_set_ot_limit(struct dpu_kms
>> *dpu_kms,
>> ot_lim = _dpu_vbif_get_ot_limit(vbif, params) & 0xFF;
>>
>> if (ot_lim == 0)
>> - goto exit;
>> + return;
>>
>> trace_dpu_perf_set_ot(params->num, params->xin_id, ot_lim,
>> params->vbif_idx);
>> @@ -210,8 +210,6 @@ void dpu_vbif_set_ot_limit(struct dpu_kms
>> *dpu_kms,
>>
>> if (forced_on)
>> mdp->ops.setup_clk_force_ctrl(mdp, params->clk_ctrl,
>> false);
>> -exit:
>> - return;
>> }
>>
>> void dpu_vbif_set_qos_remap(struct dpu_kms *dpu_kms,
--
Jeykumar S
More information about the Freedreno
mailing list