Skip to content

Commit

Permalink
drm/msm/dpu: fix comparing pointer to 0 in dpu_encoder.c
Browse files Browse the repository at this point in the history
Fixes coccicheck warning:

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:464:56-57: WARNING comparing pointer to 0
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:571:15-16: WARNING comparing pointer to 0
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:571:32-33: WARNING comparing pointer to 0
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:571:49-50: WARNING comparing pointer to 0
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:1968:17-18: WARNING comparing pointer to 0
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:1981:17-18: WARNING comparing pointer to 0
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:2012:51-52: WARNING comparing pointer to 0

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zheng Bin <zhengbin13@huawei.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>
  • Loading branch information
Zheng Bin authored and Rob Clark committed Mar 19, 2020
1 parent a41aa44 commit e6790f7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ void dpu_encoder_helper_split_config(
struct msm_display_info *disp_info;

if (!phys_enc->hw_mdptop || !phys_enc->parent) {
DPU_ERROR("invalid arg(s), encoder %d\n", phys_enc != 0);
DPU_ERROR("invalid arg(s), encoder %d\n", phys_enc != NULL);
return;
}

Expand Down Expand Up @@ -567,7 +567,7 @@ static int dpu_encoder_virt_atomic_check(

if (!drm_enc || !crtc_state || !conn_state) {
DPU_ERROR("invalid arg(s), drm_enc %d, crtc/conn state %d/%d\n",
drm_enc != 0, crtc_state != 0, conn_state != 0);
drm_enc != NULL, crtc_state != NULL, conn_state != NULL);
return -EINVAL;
}

Expand Down Expand Up @@ -1947,7 +1947,7 @@ static int dpu_encoder_virt_add_phys_encs(
if (IS_ERR_OR_NULL(enc)) {
DPU_ERROR_ENC(dpu_enc, "failed to init vid enc: %ld\n",
PTR_ERR(enc));
return enc == 0 ? -EINVAL : PTR_ERR(enc);
return enc == NULL ? -EINVAL : PTR_ERR(enc);
}

dpu_enc->phys_encs[dpu_enc->num_phys_encs] = enc;
Expand All @@ -1960,7 +1960,7 @@ static int dpu_encoder_virt_add_phys_encs(
if (IS_ERR_OR_NULL(enc)) {
DPU_ERROR_ENC(dpu_enc, "failed to init cmd enc: %ld\n",
PTR_ERR(enc));
return enc == 0 ? -EINVAL : PTR_ERR(enc);
return enc == NULL ? -EINVAL : PTR_ERR(enc);
}

dpu_enc->phys_encs[dpu_enc->num_phys_encs] = enc;
Expand Down Expand Up @@ -1991,7 +1991,7 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
struct dpu_enc_phys_init_params phys_params;

if (!dpu_enc) {
DPU_ERROR("invalid arg(s), enc %d\n", dpu_enc != 0);
DPU_ERROR("invalid arg(s), enc %d\n", dpu_enc != NULL);
return -EINVAL;
}

Expand Down

0 comments on commit e6790f7

Please sign in to comment.