mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
media: v4l: Use memset_after() helper
The CLEAR_AFTER_FIELD defined here is functionally the same as memset_after() helper, so replace it with memset_after() to simplify the code, no functional change in this patch. Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
928a6ea426
commit
0625b6b823
1 changed files with 39 additions and 45 deletions
|
@ -31,12 +31,6 @@
|
|||
|
||||
#include <trace/events/v4l2.h>
|
||||
|
||||
/* Zero out the end of the struct pointed to by p. Everything after, but
|
||||
* not including, the specified field is cleared. */
|
||||
#define CLEAR_AFTER_FIELD(p, field) \
|
||||
memset((u8 *)(p) + offsetof(typeof(*(p)), field) + sizeof((p)->field), \
|
||||
0, sizeof(*(p)) - offsetof(typeof(*(p)), field) - sizeof((p)->field))
|
||||
|
||||
#define is_valid_ioctl(vfd, cmd) test_bit(_IOC_NR(cmd), (vfd)->valid_ioctls)
|
||||
|
||||
struct std_descr {
|
||||
|
@ -1531,7 +1525,7 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
|
|||
p->mbus_code = 0;
|
||||
|
||||
mbus_code = p->mbus_code;
|
||||
CLEAR_AFTER_FIELD(p, type);
|
||||
memset_after(p, 0, type);
|
||||
p->mbus_code = mbus_code;
|
||||
|
||||
switch (p->type) {
|
||||
|
@ -1706,7 +1700,7 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
|
|||
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
|
||||
if (unlikely(!ops->vidioc_s_fmt_vid_cap))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.pix);
|
||||
memset_after(p, 0, fmt.pix);
|
||||
ret = ops->vidioc_s_fmt_vid_cap(file, fh, arg);
|
||||
/* just in case the driver zeroed it again */
|
||||
p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
|
||||
|
@ -1716,30 +1710,30 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
|
|||
case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
|
||||
if (unlikely(!ops->vidioc_s_fmt_vid_cap_mplane))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
|
||||
memset_after(p, 0, fmt.pix_mp.xfer_func);
|
||||
for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
|
||||
CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
|
||||
bytesperline);
|
||||
memset_after(&p->fmt.pix_mp.plane_fmt[i],
|
||||
0, bytesperline);
|
||||
return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_VIDEO_OVERLAY:
|
||||
if (unlikely(!ops->vidioc_s_fmt_vid_overlay))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.win);
|
||||
memset_after(p, 0, fmt.win);
|
||||
return ops->vidioc_s_fmt_vid_overlay(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_VBI_CAPTURE:
|
||||
if (unlikely(!ops->vidioc_s_fmt_vbi_cap))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.vbi.flags);
|
||||
memset_after(p, 0, fmt.vbi.flags);
|
||||
return ops->vidioc_s_fmt_vbi_cap(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
|
||||
if (unlikely(!ops->vidioc_s_fmt_sliced_vbi_cap))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.sliced.io_size);
|
||||
memset_after(p, 0, fmt.sliced.io_size);
|
||||
return ops->vidioc_s_fmt_sliced_vbi_cap(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_VIDEO_OUTPUT:
|
||||
if (unlikely(!ops->vidioc_s_fmt_vid_out))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.pix);
|
||||
memset_after(p, 0, fmt.pix);
|
||||
ret = ops->vidioc_s_fmt_vid_out(file, fh, arg);
|
||||
/* just in case the driver zeroed it again */
|
||||
p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
|
||||
|
@ -1747,45 +1741,45 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
|
|||
case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
|
||||
if (unlikely(!ops->vidioc_s_fmt_vid_out_mplane))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
|
||||
memset_after(p, 0, fmt.pix_mp.xfer_func);
|
||||
for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
|
||||
CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
|
||||
bytesperline);
|
||||
memset_after(&p->fmt.pix_mp.plane_fmt[i],
|
||||
0, bytesperline);
|
||||
return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
|
||||
if (unlikely(!ops->vidioc_s_fmt_vid_out_overlay))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.win);
|
||||
memset_after(p, 0, fmt.win);
|
||||
return ops->vidioc_s_fmt_vid_out_overlay(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_VBI_OUTPUT:
|
||||
if (unlikely(!ops->vidioc_s_fmt_vbi_out))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.vbi.flags);
|
||||
memset_after(p, 0, fmt.vbi.flags);
|
||||
return ops->vidioc_s_fmt_vbi_out(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
|
||||
if (unlikely(!ops->vidioc_s_fmt_sliced_vbi_out))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.sliced.io_size);
|
||||
memset_after(p, 0, fmt.sliced.io_size);
|
||||
return ops->vidioc_s_fmt_sliced_vbi_out(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_SDR_CAPTURE:
|
||||
if (unlikely(!ops->vidioc_s_fmt_sdr_cap))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.sdr.buffersize);
|
||||
memset_after(p, 0, fmt.sdr.buffersize);
|
||||
return ops->vidioc_s_fmt_sdr_cap(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_SDR_OUTPUT:
|
||||
if (unlikely(!ops->vidioc_s_fmt_sdr_out))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.sdr.buffersize);
|
||||
memset_after(p, 0, fmt.sdr.buffersize);
|
||||
return ops->vidioc_s_fmt_sdr_out(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_META_CAPTURE:
|
||||
if (unlikely(!ops->vidioc_s_fmt_meta_cap))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.meta);
|
||||
memset_after(p, 0, fmt.meta);
|
||||
return ops->vidioc_s_fmt_meta_cap(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_META_OUTPUT:
|
||||
if (unlikely(!ops->vidioc_s_fmt_meta_out))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.meta);
|
||||
memset_after(p, 0, fmt.meta);
|
||||
return ops->vidioc_s_fmt_meta_out(file, fh, arg);
|
||||
}
|
||||
return -EINVAL;
|
||||
|
@ -1808,7 +1802,7 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
|
|||
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
|
||||
if (unlikely(!ops->vidioc_try_fmt_vid_cap))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.pix);
|
||||
memset_after(p, 0, fmt.pix);
|
||||
ret = ops->vidioc_try_fmt_vid_cap(file, fh, arg);
|
||||
/* just in case the driver zeroed it again */
|
||||
p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
|
||||
|
@ -1818,30 +1812,30 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
|
|||
case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
|
||||
if (unlikely(!ops->vidioc_try_fmt_vid_cap_mplane))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
|
||||
memset_after(p, 0, fmt.pix_mp.xfer_func);
|
||||
for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
|
||||
CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
|
||||
bytesperline);
|
||||
memset_after(&p->fmt.pix_mp.plane_fmt[i],
|
||||
0, bytesperline);
|
||||
return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_VIDEO_OVERLAY:
|
||||
if (unlikely(!ops->vidioc_try_fmt_vid_overlay))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.win);
|
||||
memset_after(p, 0, fmt.win);
|
||||
return ops->vidioc_try_fmt_vid_overlay(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_VBI_CAPTURE:
|
||||
if (unlikely(!ops->vidioc_try_fmt_vbi_cap))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.vbi.flags);
|
||||
memset_after(p, 0, fmt.vbi.flags);
|
||||
return ops->vidioc_try_fmt_vbi_cap(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
|
||||
if (unlikely(!ops->vidioc_try_fmt_sliced_vbi_cap))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.sliced.io_size);
|
||||
memset_after(p, 0, fmt.sliced.io_size);
|
||||
return ops->vidioc_try_fmt_sliced_vbi_cap(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_VIDEO_OUTPUT:
|
||||
if (unlikely(!ops->vidioc_try_fmt_vid_out))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.pix);
|
||||
memset_after(p, 0, fmt.pix);
|
||||
ret = ops->vidioc_try_fmt_vid_out(file, fh, arg);
|
||||
/* just in case the driver zeroed it again */
|
||||
p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
|
||||
|
@ -1849,45 +1843,45 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
|
|||
case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
|
||||
if (unlikely(!ops->vidioc_try_fmt_vid_out_mplane))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
|
||||
memset_after(p, 0, fmt.pix_mp.xfer_func);
|
||||
for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
|
||||
CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
|
||||
bytesperline);
|
||||
memset_after(&p->fmt.pix_mp.plane_fmt[i],
|
||||
0, bytesperline);
|
||||
return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
|
||||
if (unlikely(!ops->vidioc_try_fmt_vid_out_overlay))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.win);
|
||||
memset_after(p, 0, fmt.win);
|
||||
return ops->vidioc_try_fmt_vid_out_overlay(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_VBI_OUTPUT:
|
||||
if (unlikely(!ops->vidioc_try_fmt_vbi_out))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.vbi.flags);
|
||||
memset_after(p, 0, fmt.vbi.flags);
|
||||
return ops->vidioc_try_fmt_vbi_out(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
|
||||
if (unlikely(!ops->vidioc_try_fmt_sliced_vbi_out))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.sliced.io_size);
|
||||
memset_after(p, 0, fmt.sliced.io_size);
|
||||
return ops->vidioc_try_fmt_sliced_vbi_out(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_SDR_CAPTURE:
|
||||
if (unlikely(!ops->vidioc_try_fmt_sdr_cap))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.sdr.buffersize);
|
||||
memset_after(p, 0, fmt.sdr.buffersize);
|
||||
return ops->vidioc_try_fmt_sdr_cap(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_SDR_OUTPUT:
|
||||
if (unlikely(!ops->vidioc_try_fmt_sdr_out))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.sdr.buffersize);
|
||||
memset_after(p, 0, fmt.sdr.buffersize);
|
||||
return ops->vidioc_try_fmt_sdr_out(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_META_CAPTURE:
|
||||
if (unlikely(!ops->vidioc_try_fmt_meta_cap))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.meta);
|
||||
memset_after(p, 0, fmt.meta);
|
||||
return ops->vidioc_try_fmt_meta_cap(file, fh, arg);
|
||||
case V4L2_BUF_TYPE_META_OUTPUT:
|
||||
if (unlikely(!ops->vidioc_try_fmt_meta_out))
|
||||
break;
|
||||
CLEAR_AFTER_FIELD(p, fmt.meta);
|
||||
memset_after(p, 0, fmt.meta);
|
||||
return ops->vidioc_try_fmt_meta_out(file, fh, arg);
|
||||
}
|
||||
return -EINVAL;
|
||||
|
@ -2086,7 +2080,7 @@ static int v4l_reqbufs(const struct v4l2_ioctl_ops *ops,
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
CLEAR_AFTER_FIELD(p, flags);
|
||||
memset_after(p, 0, flags);
|
||||
|
||||
return ops->vidioc_reqbufs(file, fh, p);
|
||||
}
|
||||
|
@ -2127,7 +2121,7 @@ static int v4l_create_bufs(const struct v4l2_ioctl_ops *ops,
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
CLEAR_AFTER_FIELD(create, flags);
|
||||
memset_after(create, 0, flags);
|
||||
|
||||
v4l_sanitize_format(&create->format);
|
||||
|
||||
|
|
Loading…
Reference in a new issue