Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/msm/dpu: Remove unnecessary NULL checks

msm_drm_private.kms will only be NULL in the dummy headless case, so
there is no need to check it in the dpu display driver.

Signed-off-by: Drew Davenport <ddavenport@chromium.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>

authored by

Drew Davenport and committed by
Rob Clark
96630140 c3739878

+19 -45
+10 -13
drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c
··· 55 55 int dpu_core_irq_idx_lookup(struct dpu_kms *dpu_kms, 56 56 enum dpu_intr_type intr_type, u32 instance_idx) 57 57 { 58 - if (!dpu_kms || !dpu_kms->hw_intr || 59 - !dpu_kms->hw_intr->ops.irq_idx_lookup) 58 + if (!dpu_kms->hw_intr || !dpu_kms->hw_intr->ops.irq_idx_lookup) 60 59 return -EINVAL; 61 60 62 61 return dpu_kms->hw_intr->ops.irq_idx_lookup(intr_type, ··· 72 73 unsigned long irq_flags; 73 74 int ret = 0, enable_count; 74 75 75 - if (!dpu_kms || !dpu_kms->hw_intr || 76 + if (!dpu_kms->hw_intr || 76 77 !dpu_kms->irq_obj.enable_counts || 77 78 !dpu_kms->irq_obj.irq_counts) { 78 79 DPU_ERROR("invalid params\n"); ··· 113 114 { 114 115 int i, ret = 0, counts; 115 116 116 - if (!dpu_kms || !irq_idxs || !irq_count) { 117 + if (!irq_idxs || !irq_count) { 117 118 DPU_ERROR("invalid params\n"); 118 119 return -EINVAL; 119 120 } ··· 137 138 { 138 139 int ret = 0, enable_count; 139 140 140 - if (!dpu_kms || !dpu_kms->hw_intr || !dpu_kms->irq_obj.enable_counts) { 141 + if (!dpu_kms->hw_intr || !dpu_kms->irq_obj.enable_counts) { 141 142 DPU_ERROR("invalid params\n"); 142 143 return -EINVAL; 143 144 } ··· 168 169 { 169 170 int i, ret = 0, counts; 170 171 171 - if (!dpu_kms || !irq_idxs || !irq_count) { 172 + if (!irq_idxs || !irq_count) { 172 173 DPU_ERROR("invalid params\n"); 173 174 return -EINVAL; 174 175 } ··· 185 186 186 187 u32 dpu_core_irq_read(struct dpu_kms *dpu_kms, int irq_idx, bool clear) 187 188 { 188 - if (!dpu_kms || !dpu_kms->hw_intr || 189 + if (!dpu_kms->hw_intr || 189 190 !dpu_kms->hw_intr->ops.get_interrupt_status) 190 191 return 0; 191 192 ··· 204 205 { 205 206 unsigned long irq_flags; 206 207 207 - if (!dpu_kms || !dpu_kms->irq_obj.irq_cb_tbl) { 208 + if (!dpu_kms->irq_obj.irq_cb_tbl) { 208 209 DPU_ERROR("invalid params\n"); 209 210 return -EINVAL; 210 211 } ··· 239 240 { 240 241 unsigned long irq_flags; 241 242 242 - if (!dpu_kms || !dpu_kms->irq_obj.irq_cb_tbl) { 243 + if (!dpu_kms->irq_obj.irq_cb_tbl) { 243 244 DPU_ERROR("invalid params\n"); 244 245 return -EINVAL; 245 246 } ··· 273 274 274 275 static void dpu_clear_all_irqs(struct dpu_kms *dpu_kms) 275 276 { 276 - if (!dpu_kms || !dpu_kms->hw_intr || 277 - !dpu_kms->hw_intr->ops.clear_all_irqs) 277 + if (!dpu_kms->hw_intr || !dpu_kms->hw_intr->ops.clear_all_irqs) 278 278 return; 279 279 280 280 dpu_kms->hw_intr->ops.clear_all_irqs(dpu_kms->hw_intr); ··· 281 283 282 284 static void dpu_disable_all_irqs(struct dpu_kms *dpu_kms) 283 285 { 284 - if (!dpu_kms || !dpu_kms->hw_intr || 285 - !dpu_kms->hw_intr->ops.disable_all_irqs) 286 + if (!dpu_kms->hw_intr || !dpu_kms->hw_intr->ops.disable_all_irqs) 286 287 return; 287 288 288 289 dpu_kms->hw_intr->ops.disable_all_irqs(dpu_kms->hw_intr);
+3 -9
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
··· 32 32 static struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc) 33 33 { 34 34 struct msm_drm_private *priv; 35 - 36 35 priv = crtc->dev->dev_private; 37 - if (!priv->kms) { 38 - DPU_ERROR("invalid kms\n"); 39 - return NULL; 40 - } 41 - 42 36 return to_dpu_kms(priv->kms); 43 37 } 44 38 ··· 105 111 } 106 112 107 113 kms = _dpu_crtc_get_kms(crtc); 108 - if (!kms || !kms->catalog) { 114 + if (!kms->catalog) { 109 115 DPU_ERROR("invalid parameters\n"); 110 116 return 0; 111 117 } ··· 213 219 } 214 220 215 221 kms = _dpu_crtc_get_kms(crtc); 216 - if (!kms || !kms->catalog) { 222 + if (!kms->catalog) { 217 223 DPU_ERROR("invalid kms\n"); 218 224 return; 219 225 } ··· 286 292 } 287 293 288 294 kms = _dpu_crtc_get_kms(crtc); 289 - if (!kms || !kms->catalog) { 295 + if (!kms->catalog) { 290 296 DPU_ERROR("invalid kms\n"); 291 297 return -EINVAL; 292 298 }
+2 -12
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
··· 645 645 priv = drm_enc->dev->dev_private; 646 646 647 647 dpu_kms = to_dpu_kms(priv->kms); 648 - if (!dpu_kms) { 649 - DPU_ERROR("invalid dpu_kms\n"); 650 - return; 651 - } 652 - 653 648 hw_mdptop = dpu_kms->hw_mdp; 654 649 if (!hw_mdptop) { 655 650 DPU_ERROR("invalid mdptop\n"); ··· 1093 1098 1094 1099 priv = drm_enc->dev->dev_private; 1095 1100 dpu_kms = to_dpu_kms(priv->kms); 1096 - if (!dpu_kms) { 1097 - DPU_ERROR("invalid dpu_kms\n"); 1098 - return; 1099 - } 1100 1101 1101 1102 dpu_enc = to_dpu_encoder_virt(drm_enc); 1102 1103 if (!dpu_enc || !dpu_enc->cur_master) { ··· 2023 2032 enum dpu_intf_type intf_type; 2024 2033 struct dpu_enc_phys_init_params phys_params; 2025 2034 2026 - if (!dpu_enc || !dpu_kms) { 2027 - DPU_ERROR("invalid arg(s), enc %d kms %d\n", 2028 - dpu_enc != 0, dpu_kms != 0); 2035 + if (!dpu_enc) { 2036 + DPU_ERROR("invalid arg(s), enc %d\n", dpu_enc != 0); 2029 2037 return -EINVAL; 2030 2038 } 2031 2039
+1 -1
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
··· 373 373 } 374 374 375 375 dpu_kms = phys_enc->dpu_kms; 376 - if (!dpu_kms || !dpu_kms->dev) { 376 + if (!dpu_kms->dev) { 377 377 DPU_ERROR("invalid device\n"); 378 378 return; 379 379 }
+1 -1
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
··· 374 374 struct drm_display_mode *mode, 375 375 struct drm_display_mode *adj_mode) 376 376 { 377 - if (!phys_enc || !phys_enc->dpu_kms) { 377 + if (!phys_enc) { 378 378 DPU_ERROR("invalid encoder/kms\n"); 379 379 return; 380 380 }
+1 -4
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
··· 461 461 struct msm_drm_private *priv; 462 462 int i; 463 463 464 - if (!dpu_kms) { 465 - DPU_ERROR("invalid dpu_kms\n"); 466 - return; 467 - } else if (!dpu_kms->dev) { 464 + if (!dpu_kms->dev) { 468 465 DPU_ERROR("invalid dev\n"); 469 466 return; 470 467 }
+1 -5
drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
··· 154 154 u32 ot_lim; 155 155 int ret, i; 156 156 157 - if (!dpu_kms) { 158 - DPU_ERROR("invalid arguments\n"); 159 - return; 160 - } 161 157 mdp = dpu_kms->hw_mdp; 162 158 163 159 for (i = 0; i < ARRAY_SIZE(dpu_kms->hw_vbif); i++) { ··· 210 214 const struct dpu_vbif_qos_tbl *qos_tbl; 211 215 int i; 212 216 213 - if (!dpu_kms || !params || !dpu_kms->hw_mdp) { 217 + if (!params || !dpu_kms->hw_mdp) { 214 218 DPU_ERROR("invalid arguments\n"); 215 219 return; 216 220 }