Commit 422ed755 authored by Drew Davenport's avatar Drew Davenport Committed by Rob Clark
Browse files

drm/msm/dpu: Remove unnecessary NULL checks 



drm_device.dev_private is set to a non-NULL msm_drm_private
struct in msm_drm_init. Successful initialization of msm means
that dev_private is non-NULL so there is no need to check it
everywhere.

Signed-off-by: default avatarDrew Davenport <ddavenport@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent c3b80b28

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

+0 −6
Original line number Diff line number Diff line
@@ -349,9 +349,6 @@ void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms) 
	if (!dpu_kms->dev) {

		DPU_ERROR("invalid drm device\n");

		return;

	} else if (!dpu_kms->dev->dev_private) {

		DPU_ERROR("invalid device private\n");

		return;

	}

	priv = dpu_kms->dev->dev_private;
@@ -385,9 +382,6 @@ void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms) 
	if (!dpu_kms->dev) {

		DPU_ERROR("invalid drm device\n");

		return;

	} else if (!dpu_kms->dev->dev_private) {

		DPU_ERROR("invalid device private\n");

		return;

	}

	priv = dpu_kms->dev->dev_private;

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

+2 −2
Original line number Diff line number Diff line
@@ -33,13 +33,13 @@ static struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc) 
{

	struct msm_drm_private *priv;



	if (!crtc->dev || !crtc->dev->dev_private) {

	if (!crtc->dev) {

		DPU_ERROR("invalid device\n");

		return NULL;

	}



	priv = crtc->dev->dev_private;

	if (!priv || !priv->kms) {

	if (!priv->kms) {

		DPU_ERROR("invalid kms\n");

		return NULL;

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ static void dpu_crtc_disable(struct drm_crtc *crtc, 
	unsigned long flags;

	bool release_bandwidth = false;



	if (!crtc || !crtc->dev || !crtc->dev->dev_private || !crtc->state) {

	if (!crtc || !crtc->dev || !crtc->state) {

		DPU_ERROR("invalid crtc\n");

		return;

	}
@@ -766,7 +766,7 @@ static void dpu_crtc_enable(struct drm_crtc *crtc, 
	struct msm_drm_private *priv;

	bool request_bandwidth;



	if (!crtc || !crtc->dev || !crtc->dev->dev_private) {

	if (!crtc || !crtc->dev) {

		DPU_ERROR("invalid crtc\n");

		return;

	}

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

+5 −10
Original line number Diff line number Diff line
@@ -735,8 +735,7 @@ static int dpu_encoder_resource_control(struct drm_encoder *drm_enc, 
	struct msm_drm_private *priv;

	bool is_vid_mode = false;



	if (!drm_enc || !drm_enc->dev || !drm_enc->dev->dev_private ||

			!drm_enc->crtc) {

	if (!drm_enc || !drm_enc->dev || !drm_enc->crtc) {

		DPU_ERROR("invalid parameters\n");

		return -EINVAL;

	}
@@ -1092,7 +1091,7 @@ static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc) 
	struct msm_drm_private *priv;

	struct dpu_kms *dpu_kms;



	if (!drm_enc || !drm_enc->dev || !drm_enc->dev->dev_private) {

	if (!drm_enc || !drm_enc->dev) {

		DPU_ERROR("invalid parameters\n");

		return;

	}
@@ -1193,9 +1192,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) 
	} else if (!drm_enc->dev) {

		DPU_ERROR("invalid dev\n");

		return;

	} else if (!drm_enc->dev->dev_private) {

		DPU_ERROR("invalid dev_private\n");

		return;

	}



	dpu_enc = to_dpu_encoder_virt(drm_enc);
@@ -1734,8 +1730,7 @@ static void dpu_encoder_vsync_event_handler(struct timer_list *t) 
	struct msm_drm_private *priv;

	struct msm_drm_thread *event_thread;



	if (!drm_enc->dev || !drm_enc->dev->dev_private ||

			!drm_enc->crtc) {

	if (!drm_enc->dev || !drm_enc->crtc) {

		DPU_ERROR("invalid parameters\n");

		return;

	}
@@ -1925,7 +1920,7 @@ static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc) 


	char name[DPU_NAME_SIZE];



	if (!drm_enc->dev || !drm_enc->dev->dev_private) {

	if (!drm_enc->dev) {

		DPU_ERROR("invalid encoder or kms\n");

		return -EINVAL;

	}
@@ -2130,7 +2125,7 @@ static void dpu_encoder_frame_done_timeout(struct timer_list *t) 
	struct drm_encoder *drm_enc = &dpu_enc->base;

	u32 event;



	if (!drm_enc->dev || !drm_enc->dev->dev_private) {

	if (!drm_enc->dev) {

		DPU_ERROR("invalid parameters\n");

		return;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static void dpu_encoder_phys_cmd_tearcheck_config( 
	}



	dpu_kms = phys_enc->dpu_kms;

	if (!dpu_kms || !dpu_kms->dev || !dpu_kms->dev->dev_private) {

	if (!dpu_kms || !dpu_kms->dev) {

		DPU_ERROR("invalid device\n");

		return;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE