Fixed coverity warning by removing the dead code

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

Signed-off-by: Ameer Hamza <amhamza....@gmail.com>

---
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

Reply via email to