V4L/DVB (7949): videodev: renamed the vidioc_*_fmt_* callbacks

The naming for the callbacks that handle the VIDIOC_ENUM_FMT and
VIDIOC_S/G/TRY_FMT ioctls was very confusing. Renamed it to match
the v4l2_buf_type name.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 5ff9a58b6135..a9747a10c546 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -630,7 +630,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
         return 0;
 }
 
-static int vidioc_enum_fmt_cap(struct file *file, void  *priv,
+static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,
                                         struct v4l2_fmtdesc *f)
 {
         if (f->index > 0)
@@ -641,7 +641,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void  *priv,
         return 0;
 }
 
-static int vidioc_g_fmt_cap(struct file *file, void *priv,
+static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
         struct vivi_fh *fh = priv;
@@ -658,7 +658,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv,
         return (0);
 }
 
-static int vidioc_try_fmt_cap(struct file *file, void *priv,
+static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                         struct v4l2_format *f)
 {
         struct vivi_fh  *fh  = priv;
@@ -706,13 +706,13 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv,
 }
 
 /*FIXME: This seems to be generic enough to be at videodev2 */
-static int vidioc_s_fmt_cap(struct file *file, void *priv,
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
         struct vivi_fh  *fh = priv;
         struct videobuf_queue *q = &fh->vb_vidq;
 
-        int ret = vidioc_try_fmt_cap(file, fh, f);
+        int ret = vidioc_try_fmt_vid_cap(file, fh, f);
         if (ret < 0)
                 return (ret);
 
@@ -1066,10 +1066,10 @@ static struct video_device vivi_template = {
         .release        = video_device_release,
 
         .vidioc_querycap      = vidioc_querycap,
-        .vidioc_enum_fmt_cap  = vidioc_enum_fmt_cap,
-        .vidioc_g_fmt_cap     = vidioc_g_fmt_cap,
-        .vidioc_try_fmt_cap   = vidioc_try_fmt_cap,
-        .vidioc_s_fmt_cap     = vidioc_s_fmt_cap,
+        .vidioc_enum_fmt_vid_cap  = vidioc_enum_fmt_vid_cap,
+        .vidioc_g_fmt_vid_cap     = vidioc_g_fmt_vid_cap,
+        .vidioc_try_fmt_vid_cap   = vidioc_try_fmt_vid_cap,
+        .vidioc_s_fmt_vid_cap     = vidioc_s_fmt_vid_cap,
         .vidioc_reqbufs       = vidioc_reqbufs,
         .vidioc_querybuf      = vidioc_querybuf,
         .vidioc_qbuf          = vidioc_qbuf,