video->next_frm = list_entry(video->dma_queue.next,
                                        struct vpfe_cap_buffer, list);
 
-       if (VPFE_PIPELINE_STREAM_SINGLESHOT == video->pipe.state)
+       if (video->pipe.state == VPFE_PIPELINE_STREAM_SINGLESHOT)
                video->cur_frm = video->next_frm;
 
        list_del(&video->next_frm->list);
 
        v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_reqbufs\n");
 
-       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != req_buf->type &&
-           V4L2_BUF_TYPE_VIDEO_OUTPUT != req_buf->type) {
+       if (req_buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
+           req_buf->type != V4L2_BUF_TYPE_VIDEO_OUTPUT){
                v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buffer type\n");
                return -EINVAL;
        }
 
        v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_querybuf\n");
 
-       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != buf->type &&
-           V4L2_BUF_TYPE_VIDEO_OUTPUT != buf->type) {
+       if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
+           buf->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");
                return  -EINVAL;
        }
 
        v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_qbuf\n");
 
-       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != p->type &&
-           V4L2_BUF_TYPE_VIDEO_OUTPUT != p->type) {
+       if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
+           p->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");
                return -EINVAL;
        }
 
        v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_dqbuf\n");
 
-       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != buf->type &&
-           V4L2_BUF_TYPE_VIDEO_OUTPUT != buf->type) {
+       if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
+           buf->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");
                return -EINVAL;
        }
 
        v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_streamon\n");
 
-       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != buf_type &&
-           V4L2_BUF_TYPE_VIDEO_OUTPUT != buf_type) {
+       if (buf_type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
+           buf_type != V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");
                return ret;
        }
                return -EIO;
        }
        /* Validate the pipeline */
-       if (V4L2_BUF_TYPE_VIDEO_CAPTURE == buf_type) {
+       if (buf_type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
                ret = vpfe_video_validate_pipeline(pipe);
                if (ret < 0)
                        return ret;