drm/msm/dpu: remove some impossible error checking

I'm sure there is plenty more to remove.. this is just some of the ones
I noticed.

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

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index ee65345a1f04ea36ea6ee47e5c6fa7b53e5a8862..9876535b24260389a8ac055fca0d642922a43e4a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1430,12 +1430,6 @@ static void _dpu_encoder_trigger_flush(struct drm_encoder *drm_enc,
        int pending_kickoff_cnt;
        u32 ret = UINT_MAX;
 
-       if (!drm_enc || !phys) {
-               DPU_ERROR("invalid argument(s), drm_enc %d, phys_enc %d\n",
-                               drm_enc != 0, phys != 0);
-               return;
-       }
-
        if (!phys->hw_pp) {
                DPU_ERROR("invalid pingpong hw\n");
                return;
@@ -1568,11 +1562,6 @@ static void _dpu_encoder_kickoff_phys(struct dpu_encoder_virt *dpu_enc,
        uint32_t i, pending_flush;
        unsigned long lock_flags;
 
-       if (!dpu_enc) {
-               DPU_ERROR("invalid encoder\n");
-               return;
-       }
-
        pending_flush = 0x0;
 
        /* update pending counts and trigger kickoff ctl flush atomically */
@@ -1800,10 +1789,6 @@ void dpu_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, bool async)
        bool needs_hw_reset = false;
        unsigned int i;
 
-       if (!drm_enc) {
-               DPU_ERROR("invalid args\n");
-               return;
-       }
        dpu_enc = to_dpu_encoder_virt(drm_enc);
 
        trace_dpu_enc_prepare_kickoff(DRMID(drm_enc));
@@ -1839,10 +1824,6 @@ void dpu_encoder_kickoff(struct drm_encoder *drm_enc, bool async)
        ktime_t wakeup_time;
        unsigned int i;
 
-       if (!drm_enc) {
-               DPU_ERROR("invalid encoder\n");
-               return;
-       }
        DPU_ATRACE_BEGIN("encoder_kickoff");
        dpu_enc = to_dpu_encoder_virt(drm_enc);
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
index 1b3ab909f367b159a0c04402f85dcfb5c00b84f7..2923b63d95fec7025b410d4958b0143071d6958a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
@@ -720,9 +720,6 @@ static int dpu_encoder_phys_cmd_wait_for_vblank(
 static void dpu_encoder_phys_cmd_handle_post_kickoff(
                struct dpu_encoder_phys *phys_enc)
 {
-       if (!phys_enc)
-               return;
-
        /**
         * re-enable external TE, either for the first time after enabling
         * or if disabled for Autorefresh

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
index 5055a5eec86940a695e0deec09b1be4d6abf10e2..737fe963a4908d23ebf12cd8b1d82dccdab99802 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
@@ -612,11 +612,6 @@ static void dpu_encoder_phys_vid_handle_post_kickoff(
 {
        unsigned long lock_flags;
 
-       if (!phys_enc) {
-               DPU_ERROR("invalid encoder\n");
-               return;
-       }
-
        /*
         * Video mode must flush CTL before enabling timing engine
         * Video encoders need to turn on their interfaces now

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
index b2f7b0e886b59ba186a36b1ae8d904185d12a0ef..179e8d52cadb41346f9089ae59bd90b23adcfd85 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
@@ -102,9 +102,6 @@ static inline void dpu_hw_ctl_update_pending_flush(struct dpu_hw_ctl *ctx,
 
 static u32 dpu_hw_ctl_get_pending_flush(struct dpu_hw_ctl *ctx)
 {
-       if (!ctx)
-               return 0x0;
-
        return ctx->pending_flush_mask;
 }
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 9520c4578ac6360cb74b090b88e8eb4427e79d64..e07eb2d9ab614399dd0ea7ae63b4fa3f7f253556 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -492,11 +492,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;
 
-       if (!dpu_kms || !dpu_kms->dev || !dpu_kms->dev->dev) {
-               DPU_ERROR("invalid dpu_kms\n");
-               return -EINVAL;
-       }
-
        dev = dpu_kms->dev;
        priv = dev->dev_private;
        catalog = dpu_kms->catalog;

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
index 6a30c4fd24da15d7e388a00dfa415e6f99deaf1b..8d24b79fd400b2a470bafd851402789adffa2c68 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
@@ -265,11 +265,6 @@ void dpu_vbif_clear_errors(struct dpu_kms *dpu_kms)
        struct dpu_hw_vbif *vbif;
        u32 i, pnd, src;
 
-       if (!dpu_kms) {
-               DPU_ERROR("invalid argument\n");
-               return;
-       }
-
        for (i = 0; i < ARRAY_SIZE(dpu_kms->hw_vbif); i++) {
                vbif = dpu_kms->hw_vbif[i];
                if (vbif && vbif->ops.clear_errors) {
@@ -287,11 +282,6 @@ void dpu_vbif_init_memtypes(struct dpu_kms *dpu_kms)
        struct dpu_hw_vbif *vbif;
        int i, j;
 
-       if (!dpu_kms) {
-               DPU_ERROR("invalid argument\n");
-               return;
-       }
-
        for (i = 0; i < ARRAY_SIZE(dpu_kms->hw_vbif); i++) {
                vbif = dpu_kms->hw_vbif[i];
                if (vbif && vbif->cap && vbif->ops.set_mem_type) {