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>

3 files changed, 28 insertions, 28 deletions

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 0165aac533b..c4aa802494f 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -2448,7 +2448,7 @@ pix_format_set_size     (struct v4l2_pix_format *       f,
         }
 }
 
-static int bttv_g_fmt_cap(struct file *file, void *priv,
+static int bttv_g_fmt_vid_cap(struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
         struct bttv_fh *fh  = priv;
@@ -2461,7 +2461,7 @@ static int bttv_g_fmt_cap(struct file *file, void *priv,
         return 0;
 }
 
-static int bttv_g_fmt_overlay(struct file *file, void *priv,
+static int bttv_g_fmt_vid_overlay(struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
         struct bttv_fh *fh  = priv;
@@ -2472,7 +2472,7 @@ static int bttv_g_fmt_overlay(struct file *file, void *priv,
         return 0;
 }
 
-static int bttv_try_fmt_cap(struct file *file, void *priv,
+static int bttv_try_fmt_vid_cap(struct file *file, void *priv,
                                                 struct v4l2_format *f)
 {
         const struct bttv_format *fmt;
@@ -2532,7 +2532,7 @@ static int bttv_try_fmt_cap(struct file *file, void *priv,
         return 0;
 }
 
-static int bttv_try_fmt_overlay(struct file *file, void *priv,
+static int bttv_try_fmt_vid_overlay(struct file *file, void *priv,
                                                 struct v4l2_format *f)
 {
         struct bttv_fh *fh = priv;
@@ -2542,7 +2542,7 @@ static int bttv_try_fmt_overlay(struct file *file, void *priv,
                         /* adjust_crop */ 0);
 }
 
-static int bttv_s_fmt_cap(struct file *file, void *priv,
+static int bttv_s_fmt_vid_cap(struct file *file, void *priv,
                                 struct v4l2_format *f)
 {
         int retval;
@@ -2556,7 +2556,7 @@ static int bttv_s_fmt_cap(struct file *file, void *priv,
         if (0 != retval)
                 return retval;
 
-        retval = bttv_try_fmt_cap(file, priv, f);
+        retval = bttv_try_fmt_vid_cap(file, priv, f);
         if (0 != retval)
                 return retval;
 
@@ -2591,7 +2591,7 @@ static int bttv_s_fmt_cap(struct file *file, void *priv,
         return 0;
 }
 
-static int bttv_s_fmt_overlay(struct file *file, void *priv,
+static int bttv_s_fmt_vid_overlay(struct file *file, void *priv,
                                 struct v4l2_format *f)
 {
         struct bttv_fh *fh = priv;
@@ -2661,7 +2661,7 @@ static int bttv_querycap(struct file *file, void  *priv,
         return 0;
 }
 
-static int bttv_enum_fmt_vbi(struct file *file, void  *priv,
+static int bttv_enum_fmt_vbi_cap(struct file *file, void  *priv,
                                 struct v4l2_fmtdesc *f)
 {
         if (0 != f->index)
@@ -2692,7 +2692,7 @@ static int bttv_enum_fmt_cap_ovr(struct v4l2_fmtdesc *f)
         return i;
 }
 
-static int bttv_enum_fmt_cap(struct file *file, void  *priv,
+static int bttv_enum_fmt_vid_cap(struct file *file, void  *priv,
                                 struct v4l2_fmtdesc *f)
 {
         int rc = bttv_enum_fmt_cap_ovr(f);
@@ -2703,7 +2703,7 @@ static int bttv_enum_fmt_cap(struct file *file, void  *priv,
         return 0;
 }
 
-static int bttv_enum_fmt_overlay(struct file *file, void  *priv,
+static int bttv_enum_fmt_vid_overlay(struct file *file, void  *priv,
                                         struct v4l2_fmtdesc *f)
 {
         int rc;
@@ -3362,18 +3362,18 @@ static struct video_device bttv_video_template =
         .fops     = &bttv_fops,
         .minor    = -1,
         .vidioc_querycap                = bttv_querycap,
-        .vidioc_enum_fmt_cap            = bttv_enum_fmt_cap,
-        .vidioc_g_fmt_cap               = bttv_g_fmt_cap,
-        .vidioc_try_fmt_cap             = bttv_try_fmt_cap,
-        .vidioc_s_fmt_cap               = bttv_s_fmt_cap,
-        .vidioc_enum_fmt_overlay        = bttv_enum_fmt_overlay,
-        .vidioc_g_fmt_overlay           = bttv_g_fmt_overlay,
-        .vidioc_try_fmt_overlay         = bttv_try_fmt_overlay,
-        .vidioc_s_fmt_overlay           = bttv_s_fmt_overlay,
-        .vidioc_enum_fmt_vbi            = bttv_enum_fmt_vbi,
-        .vidioc_g_fmt_vbi               = bttv_g_fmt_vbi,
-        .vidioc_try_fmt_vbi             = bttv_try_fmt_vbi,
-        .vidioc_s_fmt_vbi               = bttv_s_fmt_vbi,
+        .vidioc_enum_fmt_vid_cap        = bttv_enum_fmt_vid_cap,
+        .vidioc_g_fmt_vid_cap           = bttv_g_fmt_vid_cap,
+        .vidioc_try_fmt_vid_cap         = bttv_try_fmt_vid_cap,
+        .vidioc_s_fmt_vid_cap           = bttv_s_fmt_vid_cap,
+        .vidioc_enum_fmt_vid_overlay    = bttv_enum_fmt_vid_overlay,
+        .vidioc_g_fmt_vid_overlay       = bttv_g_fmt_vid_overlay,
+        .vidioc_try_fmt_vid_overlay     = bttv_try_fmt_vid_overlay,
+        .vidioc_s_fmt_vid_overlay       = bttv_s_fmt_vid_overlay,
+        .vidioc_enum_fmt_vbi_cap        = bttv_enum_fmt_vbi_cap,
+        .vidioc_g_fmt_vbi_cap           = bttv_g_fmt_vbi_cap,
+        .vidioc_try_fmt_vbi_cap         = bttv_try_fmt_vbi_cap,
+        .vidioc_s_fmt_vbi_cap           = bttv_s_fmt_vbi_cap,
         .vidioc_g_audio                 = bttv_g_audio,
         .vidioc_s_audio                 = bttv_s_audio,
         .vidioc_cropcap                 = bttv_cropcap,
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index bfdbc469e30..68f28e5fa04 100644
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -303,7 +303,7 @@ static int try_fmt(struct v4l2_vbi_format *f, const struct bttv_tvnorm *tvnorm,
         return 0;
 }
 
-int bttv_try_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
+int bttv_try_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt)
 {
         struct bttv_fh *fh = f;
         struct bttv *btv = fh->btv;
@@ -321,7 +321,7 @@ int bttv_try_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
 }
 
 
-int bttv_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
+int bttv_s_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt)
 {
         struct bttv_fh *fh = f;
         struct bttv *btv = fh->btv;
@@ -369,7 +369,7 @@ int bttv_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
 }
 
 
-int bttv_g_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
+int bttv_g_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt)
 {
         struct bttv_fh *fh = f;
         const struct bttv_tvnorm *tvnorm;
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 27da7b42327..955e6bcd8ae 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -254,9 +254,9 @@ int bttv_overlay_risc(struct bttv *btv, struct bttv_overlay *ov,
 /* ---------------------------------------------------------- */
 /* bttv-vbi.c                                                 */
 
-int bttv_try_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f);
-int bttv_g_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f);
-int bttv_s_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f);
+int bttv_try_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f);
+int bttv_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f);
+int bttv_s_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f);
 
 extern struct videobuf_queue_ops bttv_vbi_qops;