2021-12-03 16:18:59

by Ameer Hamza

Subject: [PATCH] drm/msm/dpu: removed logically dead code

Fixed coverity warning by removing the dead code

Addresses-Coverity: 1494147 ("Logically dead code")

Signed-off-by: Ameer Hamza <[email protected]>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
index 185379b18572..75f0c0cee661 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
@@ -751,8 +751,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(

fail:
DPU_ERROR("failed to create encoder\n");
- if (phys_enc)
- dpu_encoder_phys_vid_destroy(phys_enc);

return ERR_PTR(ret);
}
--
2.25.1

2021-12-03 18:15:58

by Dmitry Baryshkov

Subject: Re: [PATCH] drm/msm/dpu: removed logically dead code

On 03/12/2021 19:18, Ameer Hamza wrote:
> Fixed coverity warning by removing the dead code
>
> Addresses-Coverity: 1494147 ("Logically dead code")
>
> Signed-off-by: Ameer Hamza <[email protected]>

While the patch is correct, remove the 'fail' part completely by moving
DPU_ERROR and return statement in place of corresponding goto statements.

> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
> index 185379b18572..75f0c0cee661 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
> @@ -751,8 +751,6 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(
>
> fail:
> DPU_ERROR("failed to create encoder\n");
> - if (phys_enc)
> - dpu_encoder_phys_vid_destroy(phys_enc);
>
> return ERR_PTR(ret);
> }
>


--
With best wishes
Dmitry

2021-12-03 19:33:14

by Ameer Hamza

Subject: [PATCH v2] drm/msm/dpu: removed logically dead code

Fixed coverity warning by removing the dead code

Addresses-Coverity: 1494147 ("Logically dead code")

Signed-off-by: Ameer Hamza <[email protected]>

---
Changes in v2:
removed the 'fail' part completely by moving DPU_ERROR and return statement in place of corresponding goto statements.
---
.../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
index 185379b18572..ddd9d89cd456 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
@@ -698,17 +698,17 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(
{
struct dpu_encoder_phys *phys_enc = NULL;
struct dpu_encoder_irq *irq;
- int i, ret = 0;
+ int i;

if (!p) {
- ret = -EINVAL;
- goto fail;
+ DPU_ERROR("failed to create encoder due to invalid parameter\n");
+ return ERR_PTR(-EINVAL);
}

phys_enc = kzalloc(sizeof(*phys_enc), GFP_KERNEL);
if (!phys_enc) {
- ret = -ENOMEM;
- goto fail;
+ DPU_ERROR("failed to create encoder due to memory allocation error\n");
+ return ERR_PTR(-ENOMEM);
}

phys_enc->hw_mdptop = p->dpu_kms->hw_mdp;
@@ -748,11 +748,4 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(
DPU_DEBUG_VIDENC(phys_enc, "created intf idx:%d\n", p->intf_idx);

return phys_enc;
-
-fail:
- DPU_ERROR("failed to create encoder\n");
- if (phys_enc)
- dpu_encoder_phys_vid_destroy(phys_enc);
-
- return ERR_PTR(ret);
}
--
2.25.1

2021-12-03 19:56:09

by Dmitry Baryshkov

Subject: Re: [PATCH v2] drm/msm/dpu: removed logically dead code

On 03/12/2021 22:32, Ameer Hamza wrote:
> Fixed coverity warning by removing the dead code
>
> Addresses-Coverity: 1494147 ("Logically dead code")
>
> Signed-off-by: Ameer Hamza <[email protected]>

Reviewed-by: Dmitry Baryshkov <[email protected]>

>
> ---
> Changes in v2:
> removed the 'fail' part completely by moving DPU_ERROR and return statement in place of corresponding goto statements.
> ---
> .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 17 +++++------------
> 1 file changed, 5 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
> index 185379b18572..ddd9d89cd456 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
> @@ -698,17 +698,17 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(
> {
> struct dpu_encoder_phys *phys_enc = NULL;
> struct dpu_encoder_irq *irq;
> - int i, ret = 0;
> + int i;
>
> if (!p) {
> - ret = -EINVAL;
> - goto fail;
> + DPU_ERROR("failed to create encoder due to invalid parameter\n");
> + return ERR_PTR(-EINVAL);
> }
>
> phys_enc = kzalloc(sizeof(*phys_enc), GFP_KERNEL);
> if (!phys_enc) {
> - ret = -ENOMEM;
> - goto fail;
> + DPU_ERROR("failed to create encoder due to memory allocation error\n");
> + return ERR_PTR(-ENOMEM);
> }
>
> phys_enc->hw_mdptop = p->dpu_kms->hw_mdp;
> @@ -748,11 +748,4 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(
> DPU_DEBUG_VIDENC(phys_enc, "created intf idx:%d\n", p->intf_idx);
>
> return phys_enc;
> -
> -fail:
> - DPU_ERROR("failed to create encoder\n");
> - if (phys_enc)
> - dpu_encoder_phys_vid_destroy(phys_enc);
> -
> - return ERR_PTR(ret);
> }
>


--
With best wishes
Dmitry