| Message ID | 20210105152852.5733-20-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: imx: Miscellaneous fixes and cleanups for i.MX7 | expand |
On 1/5/21 7:27 AM, Laurent Pinchart wrote: > For consistency with all the other ioctl handlers, rename > vidioc_querycap() to capture_querycap(). > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/staging/media/imx/imx-media-capture.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c > index 009dd8733813..db1f551b86ea 100644 > --- a/drivers/staging/media/imx/imx-media-capture.c > +++ b/drivers/staging/media/imx/imx-media-capture.c > @@ -56,8 +56,8 @@ struct capture_priv { > * Video ioctls follow > */ > > -static int vidioc_querycap(struct file *file, void *fh, > - struct v4l2_capability *cap) > +static int capture_querycap(struct file *file, void *fh, > + struct v4l2_capability *cap) > { > struct capture_priv *priv = video_drvdata(file); > > @@ -414,7 +414,7 @@ static int capture_subscribe_event(struct v4l2_fh *fh, > } > > static const struct v4l2_ioctl_ops capture_ioctl_ops = { > - .vidioc_querycap = vidioc_querycap, > + .vidioc_querycap = capture_querycap, > > .vidioc_enum_framesizes = capture_enum_framesizes, > .vidioc_enum_frameintervals = capture_enum_frameintervals, Reviewed-by: Steve Longerbeam <slongerbeam@gmail.com>
diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c index 009dd8733813..db1f551b86ea 100644 --- a/drivers/staging/media/imx/imx-media-capture.c +++ b/drivers/staging/media/imx/imx-media-capture.c @@ -56,8 +56,8 @@ struct capture_priv { * Video ioctls follow */ -static int vidioc_querycap(struct file *file, void *fh, - struct v4l2_capability *cap) +static int capture_querycap(struct file *file, void *fh, + struct v4l2_capability *cap) { struct capture_priv *priv = video_drvdata(file); @@ -414,7 +414,7 @@ static int capture_subscribe_event(struct v4l2_fh *fh, } static const struct v4l2_ioctl_ops capture_ioctl_ops = { - .vidioc_querycap = vidioc_querycap, + .vidioc_querycap = capture_querycap, .vidioc_enum_framesizes = capture_enum_framesizes, .vidioc_enum_frameintervals = capture_enum_frameintervals,
For consistency with all the other ioctl handlers, rename vidioc_querycap() to capture_querycap(). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/staging/media/imx/imx-media-capture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)