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

drm/msm/dpu: Remove unnecessary NULL checks

dpu_kms.dev will never be NULL, so don't bother checking.

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

+1 -41
-8
drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c
··· 343 343 struct msm_drm_private *priv; 344 344 int i; 345 345 346 - if (!dpu_kms->dev) { 347 - DPU_ERROR("invalid drm device\n"); 348 - return; 349 - } 350 346 priv = dpu_kms->dev->dev_private; 351 347 352 348 pm_runtime_get_sync(&dpu_kms->pdev->dev); ··· 372 376 struct msm_drm_private *priv; 373 377 int i; 374 378 375 - if (!dpu_kms->dev) { 376 - DPU_ERROR("invalid drm device\n"); 377 - return; 378 - } 379 379 priv = dpu_kms->dev->dev_private; 380 380 381 381 pm_runtime_get_sync(&dpu_kms->pdev->dev);
-4
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->dev) { 377 - DPU_ERROR("invalid device\n"); 378 - return; 379 - } 380 376 priv = dpu_kms->dev->dev_private; 381 377 382 378 /*
+1 -29
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
··· 72 72 struct dpu_danger_safe_status status; 73 73 int i; 74 74 75 - if (!kms->dev || !kms->hw_mdp) { 75 + if (!kms->hw_mdp) { 76 76 DPU_ERROR("invalid arg(s)\n"); 77 77 return 0; 78 78 } ··· 153 153 return 0; 154 154 155 155 dev = dpu_kms->dev; 156 - if (!dev) 157 - return 0; 158 - 159 156 priv = dev->dev_private; 160 157 base = dpu_kms->mmio + regset->offset; 161 158 ··· 285 288 return; 286 289 dpu_kms = to_dpu_kms(kms); 287 290 dev = dpu_kms->dev; 288 - 289 - if (!dev) 290 - return; 291 291 priv = dev->dev_private; 292 292 293 293 /* Call prepare_commit for all affected encoders */ ··· 455 461 struct msm_drm_private *priv; 456 462 int i; 457 463 458 - if (!dpu_kms->dev) { 459 - DPU_ERROR("invalid dev\n"); 460 - return; 461 - } 462 464 priv = dpu_kms->dev->dev_private; 463 465 464 466 for (i = 0; i < priv->num_crtcs; i++) ··· 486 496 487 497 int primary_planes_idx = 0, cursor_planes_idx = 0, i, ret; 488 498 int max_crtc_count; 489 - 490 499 dev = dpu_kms->dev; 491 500 priv = dev->dev_private; 492 501 catalog = dpu_kms->catalog; ··· 565 576 int i; 566 577 567 578 dev = dpu_kms->dev; 568 - if (!dev) 569 - return; 570 579 571 580 if (dpu_kms->hw_intr) 572 581 dpu_hw_intr_destroy(dpu_kms->hw_intr); ··· 781 794 782 795 dpu_kms = to_dpu_kms(kms); 783 796 dev = dpu_kms->dev; 784 - if (!dev) { 785 - DPU_ERROR("invalid device\n"); 786 - return rc; 787 - } 788 - 789 797 priv = dev->dev_private; 790 798 791 799 atomic_set(&dpu_kms->bandwidth_ref, 0); ··· 1033 1051 struct dss_module_power *mp = &dpu_kms->mp; 1034 1052 1035 1053 ddev = dpu_kms->dev; 1036 - if (!ddev) { 1037 - DPU_ERROR("invalid drm_device\n"); 1038 - return rc; 1039 - } 1040 - 1041 1054 rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk, false); 1042 1055 if (rc) 1043 1056 DPU_ERROR("clock disable failed rc:%d\n", rc); ··· 1050 1073 struct dss_module_power *mp = &dpu_kms->mp; 1051 1074 1052 1075 ddev = dpu_kms->dev; 1053 - if (!ddev) { 1054 - DPU_ERROR("invalid drm_device\n"); 1055 - return rc; 1056 - } 1057 - 1058 1076 rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk, true); 1059 1077 if (rc) { 1060 1078 DPU_ERROR("clock enable failed rc:%d\n", rc);