[PATCH 09/14] media: vicodec: don't test if info is NULL

[Dafna Hirschfeld]

pixel info of q_data is never set to NULL
so there is no need to test if it is.

Signed-off-by: Dafna Hirschfeld <daf...@gmail.com>
---
 drivers/media/platform/vicodec/vicodec-core.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/drivers/media/platform/vicodec/vicodec-core.c 
b/drivers/media/platform/vicodec/vicodec-core.c
index ba327512e085..6276a803cc4d 100644
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@ -659,7 +659,6 @@ static int job_ready(void *priv)
 
        if (ntohl(ctx->state.header.width) != q_dst->visible_width ||
            ntohl(ctx->state.header.height) != q_dst->visible_height ||
-           !q_dst->info ||
            hdr_width_div != q_dst->info->width_div ||
            hdr_height_div != q_dst->info->height_div) {
                static const struct v4l2_event rs_event = {
@@ -768,9 +767,6 @@ static int vidioc_g_fmt(struct vicodec_ctx *ctx, struct 
v4l2_format *f)
        q_data = get_q_data(ctx, f->type);
        info = q_data->info;
 
-       if (!info)
-               info = v4l2_fwht_get_pixfmt(0);
-
        switch (f->type) {
        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
        case V4L2_BUF_TYPE_VIDEO_OUTPUT:
@@ -992,7 +988,6 @@ static int vidioc_s_fmt(struct vicodec_ctx *ctx, struct 
v4l2_format *f)
                pix = &f->fmt.pix;
                if (ctx->is_enc && V4L2_TYPE_IS_OUTPUT(f->type))
                        fmt_changed =
-                               !q_data->info ||
                                q_data->info->id != pix->pixelformat ||
                                q_data->coded_width != pix->width ||
                                q_data->coded_height != pix->height;
@@ -1015,7 +1010,6 @@ static int vidioc_s_fmt(struct vicodec_ctx *ctx, struct 
v4l2_format *f)
                pix_mp = &f->fmt.pix_mp;
                if (ctx->is_enc && V4L2_TYPE_IS_OUTPUT(f->type))
                        fmt_changed =
-                               !q_data->info ||
                                q_data->info->id != pix_mp->pixelformat ||
                                q_data->coded_width != pix_mp->width ||
                                q_data->coded_height != pix_mp->height;
@@ -1593,10 +1587,6 @@ static unsigned int total_frame_size(struct 
vicodec_q_data *q_data)
        unsigned int size;
        unsigned int chroma_div;
 
-       if (!q_data->info) {
-               WARN_ON(1);
-               return 0;
-       }
        size = q_data->coded_width * q_data->coded_height;
        chroma_div = q_data->info->width_div * q_data->info->height_div;
 
@@ -1619,9 +1609,6 @@ static int vicodec_start_streaming(struct vb2_queue *q,
        unsigned int total_planes_size;
        u8 *new_comp_frame = NULL;
 
-       if (!info)
-               return -EINVAL;
-
        chroma_div = info->width_div * info->height_div;
        q_data->sequence = 0;
 
@@ -1820,8 +1807,6 @@ static int vicodec_try_ctrl(struct v4l2_ctrl *ctrl)
 
        switch (ctrl->id) {
        case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS:
-               if (!q_dst->info)
-                       return -EINVAL;
                params = ctrl->p_new.p_fwht_params;
                if (params->width > q_dst->coded_width ||
                    params->width < MIN_WIDTH ||
-- 
2.17.1