drm/msm/dpu: Remove unnecessary NULL checks (fa8278b8) · Commits · 戴 / test

drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -343,10 +343,6 @@ void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms)
		struct msm_drm_private *priv;
		int i;

		if (!dpu_kms->dev) {
		DPU_ERROR("invalid drm device\n");
		return;
		}
		priv = dpu_kms->dev->dev_private;

		pm_runtime_get_sync(&dpu_kms->pdev->dev);
		@@ -376,10 +372,6 @@ void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms)
		struct msm_drm_private *priv;
		int i;

		if (!dpu_kms->dev) {
		DPU_ERROR("invalid drm device\n");
		return;
		}
		priv = dpu_kms->dev->dev_private;

		pm_runtime_get_sync(&dpu_kms->pdev->dev);

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -373,10 +373,6 @@ static void dpu_encoder_phys_cmd_tearcheck_config(
		}

		dpu_kms = phys_enc->dpu_kms;
		if (!dpu_kms->dev) {
		DPU_ERROR("invalid device\n");
		return;
		}
		priv = dpu_kms->dev->dev_private;

		/*

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+1 −29

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ static int _dpu_danger_signal_status(struct seq_file *s,
		struct dpu_danger_safe_status status;
		int i;

		if (!kms->dev \|\| !kms->hw_mdp) {
		if (!kms->hw_mdp) {
		DPU_ERROR("invalid arg(s)\n");
		return 0;
		}
		@@ -153,9 +153,6 @@ static int _dpu_debugfs_show_regset32(struct seq_file s, void data)
		return 0;

		dev = dpu_kms->dev;
		if (!dev)
		return 0;

		priv = dev->dev_private;
		base = dpu_kms->mmio + regset->offset;

		@@ -288,9 +285,6 @@ static void dpu_kms_prepare_commit(struct msm_kms *kms,
		return;
		dpu_kms = to_dpu_kms(kms);
		dev = dpu_kms->dev;

		if (!dev)
		return;
		priv = dev->dev_private;

		/* Call prepare_commit for all affected encoders */
		@@ -461,10 +455,6 @@ static void _dpu_kms_drm_obj_destroy(struct dpu_kms *dpu_kms)
		struct msm_drm_private *priv;
		int i;

		if (!dpu_kms->dev) {
		DPU_ERROR("invalid dev\n");
		return;
		}
		priv = dpu_kms->dev->dev_private;

		for (i = 0; i < priv->num_crtcs; i++)
		@@ -496,7 +486,6 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)

		int primary_planes_idx = 0, cursor_planes_idx = 0, i, ret;
		int max_crtc_count;

		dev = dpu_kms->dev;
		priv = dev->dev_private;
		catalog = dpu_kms->catalog;
		@@ -576,8 +565,6 @@ static void _dpu_kms_hw_destroy(struct dpu_kms *dpu_kms)
		int i;

		dev = dpu_kms->dev;
		if (!dev)
		return;

		if (dpu_kms->hw_intr)
		dpu_hw_intr_destroy(dpu_kms->hw_intr);
		@@ -794,11 +781,6 @@ static int dpu_kms_hw_init(struct msm_kms *kms)

		dpu_kms = to_dpu_kms(kms);
		dev = dpu_kms->dev;
		if (!dev) {
		DPU_ERROR("invalid device\n");
		return rc;
		}

		priv = dev->dev_private;

		atomic_set(&dpu_kms->bandwidth_ref, 0);
		@@ -1051,11 +1033,6 @@ static int __maybe_unused dpu_runtime_suspend(struct device *dev)
		struct dss_module_power *mp = &dpu_kms->mp;

		ddev = dpu_kms->dev;
		if (!ddev) {
		DPU_ERROR("invalid drm_device\n");
		return rc;
		}

		rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk, false);
		if (rc)
		DPU_ERROR("clock disable failed rc:%d\n", rc);
		@@ -1073,11 +1050,6 @@ static int __maybe_unused dpu_runtime_resume(struct device *dev)
		struct dss_module_power *mp = &dpu_kms->mp;

		ddev = dpu_kms->dev;
		if (!ddev) {
		DPU_ERROR("invalid drm_device\n");
		return rc;
		}

		rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk, true);
		if (rc) {
		DPU_ERROR("clock enable failed rc:%d\n", rc);

Admin message