Skip to content

Commit

Permalink
v4l: xilinx: multi-scaler: Fix warnings for MIXED_ENUM_TYPE
Browse files Browse the repository at this point in the history 
This patch fix the warnings for the MIXED_ENUM_TYPE type.

The actual warnings are:

- Event mixed_enum_type: enumerated type mixed with another type

Signed-off-by: Jeegar Patel <jeegar.patel@xilinx.com>
Reviewed-by: Hyun Kwon <hyun.kwon@xilinx.com>
  • Loading branch information
@Jeegarp
Jeegarp authored and Michal Simek committed Sep 1, 2020
1 parent a11a569 commit 1bd0055
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions drivers/media/platform/xilinx/xilinx-multi-scaler.c
View file
Expand Up @@ -1503,11 +1503,11 @@ vidioc_try_fmt(struct xm2msc_chan_ctx *chan_ctx, struct v4l2_format *f)
else if (pix->width > xm2msc->max_wd)
pix->width = xm2msc->max_wd;

vq = v4l2_m2m_get_vq(chan_ctx->m2m_ctx, f->type);
vq = v4l2_m2m_get_vq(chan_ctx->m2m_ctx, (enum v4l2_buf_type)f->type);
if (!vq)
return -EINVAL;

q_data = get_q_data(chan_ctx, f->type);
q_data = get_q_data(chan_ctx, (enum v4l2_buf_type)f->type);
if (!q_data)
return -EINVAL;

Expand Down Expand Up @@ -1574,7 +1574,7 @@ vidioc_s_fmt(struct xm2msc_chan_ctx *chan_ctx, struct v4l2_format *f)
unsigned int i;
unsigned int align = 1;

q_data = get_q_data(chan_ctx, f->type);
q_data = get_q_data(chan_ctx, (enum v4l2_buf_type)f->type);

q_data->width = pix->width;
q_data->height = pix->height;
Expand All @@ -1591,8 +1591,8 @@ vidioc_s_fmt(struct xm2msc_chan_ctx *chan_ctx, struct v4l2_format *f)

q_data->stride = ALIGN(q_data->stride, align);

q_data->colorspace = pix->colorspace;
q_data->field = pix->field;
q_data->colorspace = (enum v4l2_colorspace)pix->colorspace;
q_data->field = (enum v4l2_field)pix->field;
q_data->nbuffs = q_data->fmt->num_buffs;

xm2msc_cal_imagesize(chan_ctx, q_data, f->type);
Expand Down Expand Up @@ -1656,11 +1656,11 @@ static int vidioc_g_fmt(struct xm2msc_chan_ctx *chan_ctx, struct v4l2_format *f)
struct v4l2_pix_format_mplane *pix = &f->fmt.pix_mp;
unsigned int i;

vq = v4l2_m2m_get_vq(chan_ctx->m2m_ctx, f->type);
vq = v4l2_m2m_get_vq(chan_ctx->m2m_ctx, (enum v4l2_buf_type)f->type);
if (!vq)
return -EINVAL;

q_data = get_q_data(chan_ctx, f->type);
q_data = get_q_data(chan_ctx, (enum v4l2_buf_type)f->type);
if (!q_data)
return -EINVAL;

Expand Down Expand Up @@ -1765,7 +1765,7 @@ static int xm2msc_queue_setup(struct vb2_queue *vq,
struct xm2msc_chan_ctx *chan_ctx = vb2_get_drv_priv(vq);
struct xm2msc_q_data *q_data;

q_data = get_q_data(chan_ctx, vq->type);
q_data = get_q_data(chan_ctx, (enum v4l2_buf_type)vq->type);
if (!q_data)
return -EINVAL;

Expand All @@ -1789,7 +1789,7 @@ static int xm2msc_buf_prepare(struct vb2_buffer *vb)
struct xm2msc_q_data *q_data;
unsigned int i, num_buffs;

q_data = get_q_data(chan_ctx, vb->vb2_queue->type);
q_data = get_q_data(chan_ctx, (enum v4l2_buf_type)vb->vb2_queue->type);
if (!q_data)
return -EINVAL;
num_buffs = q_data->nbuffs;
Expand Down Expand Up @@ -1849,7 +1849,7 @@ static int xm2msc_start_streaming(struct vb2_queue *q, unsigned int count)
else
xm2msc_set_chan_stream(chan_ctx, true, XM2MSC_CHAN_CAP);

xm2msc_set_chan_params(chan_ctx, q->type);
xm2msc_set_chan_params(chan_ctx, (enum v4l2_buf_type)q->type);

if (xm2msc_chk_chan_stream(chan_ctx, XM2MSC_CHAN_CAP) &&
xm2msc_chk_chan_stream(chan_ctx, XM2MSC_CHAN_OUT))
Expand All @@ -1858,7 +1858,7 @@ static int xm2msc_start_streaming(struct vb2_queue *q, unsigned int count)
type = V4L2_TYPE_IS_OUTPUT(q->type) ?
V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE :
V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
q_data = get_q_data(chan_ctx, type);
q_data = get_q_data(chan_ctx, (enum v4l2_buf_type)type);
xm2msc_pr_q(chan_ctx->xm2msc_dev->dev, q_data, chan_ctx->num,
type, __func__);
xm2msc_pr_status(chan_ctx->xm2msc_dev, __func__);
Expand Down

0 comments on commit 1bd0055

Please sign in to comment.