Commit 78b526a4 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0e3bd2b9

drivers/media/video/bt8xx/bttv-driver.c

+22 −22
Original line number Diff line number Diff line
@@ -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,

drivers/media/video/bt8xx/bttv-vbi.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/bt8xx/bttvp.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/cafe_ccic.c

+9 −9
Original line number Diff line number Diff line
@@ -1593,7 +1593,7 @@ static struct v4l2_pix_format cafe_def_pix_format = { 
	.sizeimage	= VGA_WIDTH*VGA_HEIGHT*2,

};



static int cafe_vidioc_enum_fmt_cap(struct file *filp,

static int cafe_vidioc_enum_fmt_vid_cap(struct file *filp,

		void *priv, struct v4l2_fmtdesc *fmt)

{

	struct cafe_camera *cam = priv;
@@ -1608,7 +1608,7 @@ static int cafe_vidioc_enum_fmt_cap(struct file *filp, 
}





static int cafe_vidioc_try_fmt_cap (struct file *filp, void *priv,

static int cafe_vidioc_try_fmt_vid_cap(struct file *filp, void *priv,

		struct v4l2_format *fmt)

{

	struct cafe_camera *cam = priv;
@@ -1620,7 +1620,7 @@ static int cafe_vidioc_try_fmt_cap (struct file *filp, void *priv, 
	return ret;

}



static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv,

static int cafe_vidioc_s_fmt_vid_cap(struct file *filp, void *priv,

		struct v4l2_format *fmt)

{

	struct cafe_camera *cam = priv;
@@ -1635,7 +1635,7 @@ static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv, 
	/*

	 * See if the formatting works in principle.

	 */

	ret = cafe_vidioc_try_fmt_cap(filp, priv, fmt);

	ret = cafe_vidioc_try_fmt_vid_cap(filp, priv, fmt);

	if (ret)

		return ret;

	/*
@@ -1670,7 +1670,7 @@ static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv, 
 * The V4l2 spec wants us to be smarter, and actually get this from

 * the camera (and not mess with it at open time).  Someday.

 */

static int cafe_vidioc_g_fmt_cap(struct file *filp, void *priv,

static int cafe_vidioc_g_fmt_vid_cap(struct file *filp, void *priv,

		struct v4l2_format *f)

{

	struct cafe_camera *cam = priv;
@@ -1780,10 +1780,10 @@ static struct video_device cafe_v4l_template = { 
	.release = cafe_v4l_dev_release,



	.vidioc_querycap 	= cafe_vidioc_querycap,

	.vidioc_enum_fmt_cap	= cafe_vidioc_enum_fmt_cap,

	.vidioc_try_fmt_cap	= cafe_vidioc_try_fmt_cap,

	.vidioc_s_fmt_cap	= cafe_vidioc_s_fmt_cap,

	.vidioc_g_fmt_cap	= cafe_vidioc_g_fmt_cap,

	.vidioc_enum_fmt_vid_cap = cafe_vidioc_enum_fmt_vid_cap,

	.vidioc_try_fmt_vid_cap	= cafe_vidioc_try_fmt_vid_cap,

	.vidioc_s_fmt_vid_cap	= cafe_vidioc_s_fmt_vid_cap,

	.vidioc_g_fmt_vid_cap	= cafe_vidioc_g_fmt_vid_cap,

	.vidioc_enum_input	= cafe_vidioc_enum_input,

	.vidioc_g_input		= cafe_vidioc_g_input,

	.vidioc_s_input		= cafe_vidioc_s_input,

drivers/media/video/cx23885/cx23885-video.c

+12 −12
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static void init_controls(struct cx23885_dev *dev) 
/* ------------------------------------------------------------------ */

/* VIDEO IOCTLS                                                       */



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 cx23885_fh *fh   = priv;
@@ -932,7 +932,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 cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
@@ -983,7 +983,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv, 
	return 0;

}



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 cx23885_fh *fh = priv;
@@ -991,7 +991,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, 
	int err;



	dprintk(2, "%s()\n", __func__);

	err = vidioc_try_fmt_cap(file, priv, f);

	err = vidioc_try_fmt_vid_cap(file, priv, f);



	if (0 != err)

		return err;
@@ -1025,7 +1025,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 (unlikely(f->index >= ARRAY_SIZE(formats)))
@@ -1440,13 +1440,13 @@ static struct video_device cx23885_video_template = { 
	.fops                 = &video_fops,

	.minor                = -1,

	.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_g_fmt_vbi     = cx23885_vbi_fmt,

	.vidioc_try_fmt_vbi   = cx23885_vbi_fmt,

	.vidioc_s_fmt_vbi     = cx23885_vbi_fmt,

	.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_g_fmt_vbi_cap     = cx23885_vbi_fmt,

	.vidioc_try_fmt_vbi_cap   = cx23885_vbi_fmt,

	.vidioc_s_fmt_vbi_cap     = cx23885_vbi_fmt,

	.vidioc_reqbufs       = vidioc_reqbufs,

	.vidioc_querybuf      = vidioc_querybuf,

	.vidioc_qbuf          = vidioc_qbuf,