diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-28 11:16:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:07:32 -0400 |
commit | 78b526a43561d7e5e702ba27948e422dfbc4bea1 (patch) | |
tree | 67c8b7150b51f6a82275af6f5baaedff4eaf40c0 | |
parent | 0e3bd2b9996dfa4105617e2369155823df6b389a (diff) |
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>
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 44 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv-vbi.c | 6 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttvp.h | 6 | ||||
-rw-r--r-- | drivers/media/video/cafe_ccic.c | 18 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 24 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 16 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 24 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 30 | ||||
-rw-r--r-- | drivers/media/video/meye.c | 18 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-empress.c | 12 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 46 | ||||
-rw-r--r-- | drivers/media/video/stk-webcam.c | 18 | ||||
-rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 18 | ||||
-rw-r--r-- | drivers/media/video/videodev.c | 230 | ||||
-rw-r--r-- | drivers/media/video/vivi.c | 18 | ||||
-rw-r--r-- | drivers/media/video/zr364xx.c | 16 | ||||
-rw-r--r-- | include/media/v4l2-dev.h | 68 |
17 files changed, 302 insertions, 310 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, | |||
2448 | } | 2448 | } |
2449 | } | 2449 | } |
2450 | 2450 | ||
2451 | static int bttv_g_fmt_cap(struct file *file, void *priv, | 2451 | static int bttv_g_fmt_vid_cap(struct file *file, void *priv, |
2452 | struct v4l2_format *f) | 2452 | struct v4l2_format *f) |
2453 | { | 2453 | { |
2454 | struct bttv_fh *fh = priv; | 2454 | struct bttv_fh *fh = priv; |
@@ -2461,7 +2461,7 @@ static int bttv_g_fmt_cap(struct file *file, void *priv, | |||
2461 | return 0; | 2461 | return 0; |
2462 | } | 2462 | } |
2463 | 2463 | ||
2464 | static int bttv_g_fmt_overlay(struct file *file, void *priv, | 2464 | static int bttv_g_fmt_vid_overlay(struct file *file, void *priv, |
2465 | struct v4l2_format *f) | 2465 | struct v4l2_format *f) |
2466 | { | 2466 | { |
2467 | struct bttv_fh *fh = priv; | 2467 | struct bttv_fh *fh = priv; |
@@ -2472,7 +2472,7 @@ static int bttv_g_fmt_overlay(struct file *file, void *priv, | |||
2472 | return 0; | 2472 | return 0; |
2473 | } | 2473 | } |
2474 | 2474 | ||
2475 | static int bttv_try_fmt_cap(struct file *file, void *priv, | 2475 | static int bttv_try_fmt_vid_cap(struct file *file, void *priv, |
2476 | struct v4l2_format *f) | 2476 | struct v4l2_format *f) |
2477 | { | 2477 | { |
2478 | const struct bttv_format *fmt; | 2478 | const struct bttv_format *fmt; |
@@ -2532,7 +2532,7 @@ static int bttv_try_fmt_cap(struct file *file, void *priv, | |||
2532 | return 0; | 2532 | return 0; |
2533 | } | 2533 | } |
2534 | 2534 | ||
2535 | static int bttv_try_fmt_overlay(struct file *file, void *priv, | 2535 | static int bttv_try_fmt_vid_overlay(struct file *file, void *priv, |
2536 | struct v4l2_format *f) | 2536 | struct v4l2_format *f) |
2537 | { | 2537 | { |
2538 | struct bttv_fh *fh = priv; | 2538 | struct bttv_fh *fh = priv; |
@@ -2542,7 +2542,7 @@ static int bttv_try_fmt_overlay(struct file *file, void *priv, | |||
2542 | /* adjust_crop */ 0); | 2542 | /* adjust_crop */ 0); |
2543 | } | 2543 | } |
2544 | 2544 | ||
2545 | static int bttv_s_fmt_cap(struct file *file, void *priv, | 2545 | static int bttv_s_fmt_vid_cap(struct file *file, void *priv, |
2546 | struct v4l2_format *f) | 2546 | struct v4l2_format *f) |
2547 | { | 2547 | { |
2548 | int retval; | 2548 | int retval; |
@@ -2556,7 +2556,7 @@ static int bttv_s_fmt_cap(struct file *file, void *priv, | |||
2556 | if (0 != retval) | 2556 | if (0 != retval) |
2557 | return retval; | 2557 | return retval; |
2558 | 2558 | ||
2559 | retval = bttv_try_fmt_cap(file, priv, f); | 2559 | retval = bttv_try_fmt_vid_cap(file, priv, f); |
2560 | if (0 != retval) | 2560 | if (0 != retval) |
2561 | return retval; | 2561 | return retval; |
2562 | 2562 | ||
@@ -2591,7 +2591,7 @@ static int bttv_s_fmt_cap(struct file *file, void *priv, | |||
2591 | return 0; | 2591 | return 0; |
2592 | } | 2592 | } |
2593 | 2593 | ||
2594 | static int bttv_s_fmt_overlay(struct file *file, void *priv, | 2594 | static int bttv_s_fmt_vid_overlay(struct file *file, void *priv, |
2595 | struct v4l2_format *f) | 2595 | struct v4l2_format *f) |
2596 | { | 2596 | { |
2597 | struct bttv_fh *fh = priv; | 2597 | struct bttv_fh *fh = priv; |
@@ -2661,7 +2661,7 @@ static int bttv_querycap(struct file *file, void *priv, | |||
2661 | return 0; | 2661 | return 0; |
2662 | } | 2662 | } |
2663 | 2663 | ||
2664 | static int bttv_enum_fmt_vbi(struct file *file, void *priv, | 2664 | static int bttv_enum_fmt_vbi_cap(struct file *file, void *priv, |
2665 | struct v4l2_fmtdesc *f) | 2665 | struct v4l2_fmtdesc *f) |
2666 | { | 2666 | { |
2667 | if (0 != f->index) | 2667 | if (0 != f->index) |
@@ -2692,7 +2692,7 @@ static int bttv_enum_fmt_cap_ovr(struct v4l2_fmtdesc *f) | |||
2692 | return i; | 2692 | return i; |
2693 | } | 2693 | } |
2694 | 2694 | ||
2695 | static int bttv_enum_fmt_cap(struct file *file, void *priv, | 2695 | static int bttv_enum_fmt_vid_cap(struct file *file, void *priv, |
2696 | struct v4l2_fmtdesc *f) | 2696 | struct v4l2_fmtdesc *f) |
2697 | { | 2697 | { |
2698 | int rc = bttv_enum_fmt_cap_ovr(f); | 2698 | int rc = bttv_enum_fmt_cap_ovr(f); |
@@ -2703,7 +2703,7 @@ static int bttv_enum_fmt_cap(struct file *file, void *priv, | |||
2703 | return 0; | 2703 | return 0; |
2704 | } | 2704 | } |
2705 | 2705 | ||
2706 | static int bttv_enum_fmt_overlay(struct file *file, void *priv, | 2706 | static int bttv_enum_fmt_vid_overlay(struct file *file, void *priv, |
2707 | struct v4l2_fmtdesc *f) | 2707 | struct v4l2_fmtdesc *f) |
2708 | { | 2708 | { |
2709 | int rc; | 2709 | int rc; |
@@ -3362,18 +3362,18 @@ static struct video_device bttv_video_template = | |||
3362 | .fops = &bttv_fops, | 3362 | .fops = &bttv_fops, |
3363 | .minor = -1, | 3363 | .minor = -1, |
3364 | .vidioc_querycap = bttv_querycap, | 3364 | .vidioc_querycap = bttv_querycap, |
3365 | .vidioc_enum_fmt_cap = bttv_enum_fmt_cap, | 3365 | .vidioc_enum_fmt_vid_cap = bttv_enum_fmt_vid_cap, |
3366 | .vidioc_g_fmt_cap = bttv_g_fmt_cap, | 3366 | .vidioc_g_fmt_vid_cap = bttv_g_fmt_vid_cap, |
3367 | .vidioc_try_fmt_cap = bttv_try_fmt_cap, | 3367 | .vidioc_try_fmt_vid_cap = bttv_try_fmt_vid_cap, |
3368 | .vidioc_s_fmt_cap = bttv_s_fmt_cap, | 3368 | .vidioc_s_fmt_vid_cap = bttv_s_fmt_vid_cap, |
3369 | .vidioc_enum_fmt_overlay = bttv_enum_fmt_overlay, | 3369 | .vidioc_enum_fmt_vid_overlay = bttv_enum_fmt_vid_overlay, |
3370 | .vidioc_g_fmt_overlay = bttv_g_fmt_overlay, | 3370 | .vidioc_g_fmt_vid_overlay = bttv_g_fmt_vid_overlay, |
3371 | .vidioc_try_fmt_overlay = bttv_try_fmt_overlay, | 3371 | .vidioc_try_fmt_vid_overlay = bttv_try_fmt_vid_overlay, |
3372 | .vidioc_s_fmt_overlay = bttv_s_fmt_overlay, | 3372 | .vidioc_s_fmt_vid_overlay = bttv_s_fmt_vid_overlay, |
3373 | .vidioc_enum_fmt_vbi = bttv_enum_fmt_vbi, | 3373 | .vidioc_enum_fmt_vbi_cap = bttv_enum_fmt_vbi_cap, |
3374 | .vidioc_g_fmt_vbi = bttv_g_fmt_vbi, | 3374 | .vidioc_g_fmt_vbi_cap = bttv_g_fmt_vbi_cap, |
3375 | .vidioc_try_fmt_vbi = bttv_try_fmt_vbi, | 3375 | .vidioc_try_fmt_vbi_cap = bttv_try_fmt_vbi_cap, |
3376 | .vidioc_s_fmt_vbi = bttv_s_fmt_vbi, | 3376 | .vidioc_s_fmt_vbi_cap = bttv_s_fmt_vbi_cap, |
3377 | .vidioc_g_audio = bttv_g_audio, | 3377 | .vidioc_g_audio = bttv_g_audio, |
3378 | .vidioc_s_audio = bttv_s_audio, | 3378 | .vidioc_s_audio = bttv_s_audio, |
3379 | .vidioc_cropcap = bttv_cropcap, | 3379 | .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, | |||
303 | return 0; | 303 | return 0; |
304 | } | 304 | } |
305 | 305 | ||
306 | int bttv_try_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) | 306 | int bttv_try_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt) |
307 | { | 307 | { |
308 | struct bttv_fh *fh = f; | 308 | struct bttv_fh *fh = f; |
309 | struct bttv *btv = fh->btv; | 309 | struct bttv *btv = fh->btv; |
@@ -321,7 +321,7 @@ int bttv_try_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) | |||
321 | } | 321 | } |
322 | 322 | ||
323 | 323 | ||
324 | int bttv_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) | 324 | int bttv_s_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt) |
325 | { | 325 | { |
326 | struct bttv_fh *fh = f; | 326 | struct bttv_fh *fh = f; |
327 | struct bttv *btv = fh->btv; | 327 | struct bttv *btv = fh->btv; |
@@ -369,7 +369,7 @@ int bttv_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) | |||
369 | } | 369 | } |
370 | 370 | ||
371 | 371 | ||
372 | int bttv_g_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) | 372 | int bttv_g_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt) |
373 | { | 373 | { |
374 | struct bttv_fh *fh = f; | 374 | struct bttv_fh *fh = f; |
375 | const struct bttv_tvnorm *tvnorm; | 375 | 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, | |||
254 | /* ---------------------------------------------------------- */ | 254 | /* ---------------------------------------------------------- */ |
255 | /* bttv-vbi.c */ | 255 | /* bttv-vbi.c */ |
256 | 256 | ||
257 | int bttv_try_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); | 257 | int bttv_try_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f); |
258 | int bttv_g_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); | 258 | int bttv_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f); |
259 | int bttv_s_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); | 259 | int bttv_s_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f); |
260 | 260 | ||
261 | extern struct videobuf_queue_ops bttv_vbi_qops; | 261 | extern struct videobuf_queue_ops bttv_vbi_qops; |
262 | 262 | ||
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 5195b1f3378..d99453faaab 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -1593,7 +1593,7 @@ static struct v4l2_pix_format cafe_def_pix_format = { | |||
1593 | .sizeimage = VGA_WIDTH*VGA_HEIGHT*2, | 1593 | .sizeimage = VGA_WIDTH*VGA_HEIGHT*2, |
1594 | }; | 1594 | }; |
1595 | 1595 | ||
1596 | static int cafe_vidioc_enum_fmt_cap(struct file *filp, | 1596 | static int cafe_vidioc_enum_fmt_vid_cap(struct file *filp, |
1597 | void *priv, struct v4l2_fmtdesc *fmt) | 1597 | void *priv, struct v4l2_fmtdesc *fmt) |
1598 | { | 1598 | { |
1599 | struct cafe_camera *cam = priv; | 1599 | struct cafe_camera *cam = priv; |
@@ -1608,7 +1608,7 @@ static int cafe_vidioc_enum_fmt_cap(struct file *filp, | |||
1608 | } | 1608 | } |
1609 | 1609 | ||
1610 | 1610 | ||
1611 | static int cafe_vidioc_try_fmt_cap (struct file *filp, void *priv, | 1611 | static int cafe_vidioc_try_fmt_vid_cap(struct file *filp, void *priv, |
1612 | struct v4l2_format *fmt) | 1612 | struct v4l2_format *fmt) |
1613 | { | 1613 | { |
1614 | struct cafe_camera *cam = priv; | 1614 | struct cafe_camera *cam = priv; |
@@ -1620,7 +1620,7 @@ static int cafe_vidioc_try_fmt_cap (struct file *filp, void *priv, | |||
1620 | return ret; | 1620 | return ret; |
1621 | } | 1621 | } |
1622 | 1622 | ||
1623 | static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv, | 1623 | static int cafe_vidioc_s_fmt_vid_cap(struct file *filp, void *priv, |
1624 | struct v4l2_format *fmt) | 1624 | struct v4l2_format *fmt) |
1625 | { | 1625 | { |
1626 | struct cafe_camera *cam = priv; | 1626 | struct cafe_camera *cam = priv; |
@@ -1635,7 +1635,7 @@ static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv, | |||
1635 | /* | 1635 | /* |
1636 | * See if the formatting works in principle. | 1636 | * See if the formatting works in principle. |
1637 | */ | 1637 | */ |
1638 | ret = cafe_vidioc_try_fmt_cap(filp, priv, fmt); | 1638 | ret = cafe_vidioc_try_fmt_vid_cap(filp, priv, fmt); |
1639 | if (ret) | 1639 | if (ret) |
1640 | return ret; | 1640 | return ret; |
1641 | /* | 1641 | /* |
@@ -1670,7 +1670,7 @@ static int cafe_vidioc_s_fmt_cap(struct file *filp, void *priv, | |||
1670 | * The V4l2 spec wants us to be smarter, and actually get this from | 1670 | * The V4l2 spec wants us to be smarter, and actually get this from |
1671 | * the camera (and not mess with it at open time). Someday. | 1671 | * the camera (and not mess with it at open time). Someday. |
1672 | */ | 1672 | */ |
1673 | static int cafe_vidioc_g_fmt_cap(struct file *filp, void *priv, | 1673 | static int cafe_vidioc_g_fmt_vid_cap(struct file *filp, void *priv, |
1674 | struct v4l2_format *f) | 1674 | struct v4l2_format *f) |
1675 | { | 1675 | { |
1676 | struct cafe_camera *cam = priv; | 1676 | struct cafe_camera *cam = priv; |
@@ -1780,10 +1780,10 @@ static struct video_device cafe_v4l_template = { | |||
1780 | .release = cafe_v4l_dev_release, | 1780 | .release = cafe_v4l_dev_release, |
1781 | 1781 | ||
1782 | .vidioc_querycap = cafe_vidioc_querycap, | 1782 | .vidioc_querycap = cafe_vidioc_querycap, |
1783 | .vidioc_enum_fmt_cap = cafe_vidioc_enum_fmt_cap, | 1783 | .vidioc_enum_fmt_vid_cap = cafe_vidioc_enum_fmt_vid_cap, |
1784 | .vidioc_try_fmt_cap = cafe_vidioc_try_fmt_cap, | 1784 | .vidioc_try_fmt_vid_cap = cafe_vidioc_try_fmt_vid_cap, |
1785 | .vidioc_s_fmt_cap = cafe_vidioc_s_fmt_cap, | 1785 | .vidioc_s_fmt_vid_cap = cafe_vidioc_s_fmt_vid_cap, |
1786 | .vidioc_g_fmt_cap = cafe_vidioc_g_fmt_cap, | 1786 | .vidioc_g_fmt_vid_cap = cafe_vidioc_g_fmt_vid_cap, |
1787 | .vidioc_enum_input = cafe_vidioc_enum_input, | 1787 | .vidioc_enum_input = cafe_vidioc_enum_input, |
1788 | .vidioc_g_input = cafe_vidioc_g_input, | 1788 | .vidioc_g_input = cafe_vidioc_g_input, |
1789 | .vidioc_s_input = cafe_vidioc_s_input, | 1789 | .vidioc_s_input = cafe_vidioc_s_input, |
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 84652210a28..043fc4e5c58 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c | |||
@@ -915,7 +915,7 @@ static void init_controls(struct cx23885_dev *dev) | |||
915 | /* ------------------------------------------------------------------ */ | 915 | /* ------------------------------------------------------------------ */ |
916 | /* VIDEO IOCTLS */ | 916 | /* VIDEO IOCTLS */ |
917 | 917 | ||
918 | static int vidioc_g_fmt_cap(struct file *file, void *priv, | 918 | static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, |
919 | struct v4l2_format *f) | 919 | struct v4l2_format *f) |
920 | { | 920 | { |
921 | struct cx23885_fh *fh = priv; | 921 | struct cx23885_fh *fh = priv; |
@@ -932,7 +932,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv, | |||
932 | return 0; | 932 | return 0; |
933 | } | 933 | } |
934 | 934 | ||
935 | static int vidioc_try_fmt_cap(struct file *file, void *priv, | 935 | static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, |
936 | struct v4l2_format *f) | 936 | struct v4l2_format *f) |
937 | { | 937 | { |
938 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; | 938 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; |
@@ -983,7 +983,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv, | |||
983 | return 0; | 983 | return 0; |
984 | } | 984 | } |
985 | 985 | ||
986 | static int vidioc_s_fmt_cap(struct file *file, void *priv, | 986 | static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, |
987 | struct v4l2_format *f) | 987 | struct v4l2_format *f) |
988 | { | 988 | { |
989 | struct cx23885_fh *fh = priv; | 989 | struct cx23885_fh *fh = priv; |
@@ -991,7 +991,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, | |||
991 | int err; | 991 | int err; |
992 | 992 | ||
993 | dprintk(2, "%s()\n", __func__); | 993 | dprintk(2, "%s()\n", __func__); |
994 | err = vidioc_try_fmt_cap(file, priv, f); | 994 | err = vidioc_try_fmt_vid_cap(file, priv, f); |
995 | 995 | ||
996 | if (0 != err) | 996 | if (0 != err) |
997 | return err; | 997 | return err; |
@@ -1025,7 +1025,7 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
1025 | return 0; | 1025 | return 0; |
1026 | } | 1026 | } |
1027 | 1027 | ||
1028 | static int vidioc_enum_fmt_cap(struct file *file, void *priv, | 1028 | static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, |
1029 | struct v4l2_fmtdesc *f) | 1029 | struct v4l2_fmtdesc *f) |
1030 | { | 1030 | { |
1031 | if (unlikely(f->index >= ARRAY_SIZE(formats))) | 1031 | if (unlikely(f->index >= ARRAY_SIZE(formats))) |
@@ -1440,13 +1440,13 @@ static struct video_device cx23885_video_template = { | |||
1440 | .fops = &video_fops, | 1440 | .fops = &video_fops, |
1441 | .minor = -1, | 1441 | .minor = -1, |
1442 | .vidioc_querycap = vidioc_querycap, | 1442 | .vidioc_querycap = vidioc_querycap, |
1443 | .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, | 1443 | .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, |
1444 | .vidioc_g_fmt_cap = vidioc_g_fmt_cap, | 1444 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, |
1445 | .vidioc_try_fmt_cap = vidioc_try_fmt_cap, | 1445 | .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, |
1446 | .vidioc_s_fmt_cap = vidioc_s_fmt_cap, | 1446 | .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, |
1447 | .vidioc_g_fmt_vbi = cx23885_vbi_fmt, | 1447 | .vidioc_g_fmt_vbi_cap = cx23885_vbi_fmt, |
1448 | .vidioc_try_fmt_vbi = cx23885_vbi_fmt, | 1448 | .vidioc_try_fmt_vbi_cap = cx23885_vbi_fmt, |
1449 | .vidioc_s_fmt_vbi = cx23885_vbi_fmt, | 1449 | .vidioc_s_fmt_vbi_cap = cx23885_vbi_fmt, |
1450 | .vidioc_reqbufs = vidioc_reqbufs, | 1450 | .vidioc_reqbufs = vidioc_reqbufs, |
1451 | .vidioc_querybuf = vidioc_querybuf, | 1451 | .vidioc_querybuf = vidioc_querybuf, |
1452 | .vidioc_qbuf = vidioc_qbuf, | 1452 | .vidioc_qbuf = vidioc_qbuf, |
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 6c0c94c5ef9..fb67e4188b2 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -737,7 +737,7 @@ static int vidioc_querycap (struct file *file, void *priv, | |||
737 | return 0; | 737 | return 0; |
738 | } | 738 | } |
739 | 739 | ||
740 | static int vidioc_enum_fmt_cap (struct file *file, void *priv, | 740 | static int vidioc_enum_fmt_vid_cap (struct file *file, void *priv, |
741 | struct v4l2_fmtdesc *f) | 741 | struct v4l2_fmtdesc *f) |
742 | { | 742 | { |
743 | if (f->index != 0) | 743 | if (f->index != 0) |
@@ -749,7 +749,7 @@ static int vidioc_enum_fmt_cap (struct file *file, void *priv, | |||
749 | return 0; | 749 | return 0; |
750 | } | 750 | } |
751 | 751 | ||
752 | static int vidioc_g_fmt_cap (struct file *file, void *priv, | 752 | static int vidioc_g_fmt_vid_cap (struct file *file, void *priv, |
753 | struct v4l2_format *f) | 753 | struct v4l2_format *f) |
754 | { | 754 | { |
755 | struct cx8802_fh *fh = priv; | 755 | struct cx8802_fh *fh = priv; |
@@ -768,7 +768,7 @@ static int vidioc_g_fmt_cap (struct file *file, void *priv, | |||
768 | return 0; | 768 | return 0; |
769 | } | 769 | } |
770 | 770 | ||
771 | static int vidioc_try_fmt_cap (struct file *file, void *priv, | 771 | static int vidioc_try_fmt_vid_cap (struct file *file, void *priv, |
772 | struct v4l2_format *f) | 772 | struct v4l2_format *f) |
773 | { | 773 | { |
774 | struct cx8802_fh *fh = priv; | 774 | struct cx8802_fh *fh = priv; |
@@ -784,7 +784,7 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv, | |||
784 | return 0; | 784 | return 0; |
785 | } | 785 | } |
786 | 786 | ||
787 | static int vidioc_s_fmt_cap (struct file *file, void *priv, | 787 | static int vidioc_s_fmt_vid_cap (struct file *file, void *priv, |
788 | struct v4l2_format *f) | 788 | struct v4l2_format *f) |
789 | { | 789 | { |
790 | struct cx8802_fh *fh = priv; | 790 | struct cx8802_fh *fh = priv; |
@@ -1181,10 +1181,10 @@ static struct video_device cx8802_mpeg_template = | |||
1181 | .minor = -1, | 1181 | .minor = -1, |
1182 | .vidioc_querymenu = vidioc_querymenu, | 1182 | .vidioc_querymenu = vidioc_querymenu, |
1183 | .vidioc_querycap = vidioc_querycap, | 1183 | .vidioc_querycap = vidioc_querycap, |
1184 | .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, | 1184 | .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, |
1185 | .vidioc_g_fmt_cap = vidioc_g_fmt_cap, | 1185 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, |
1186 | .vidioc_try_fmt_cap = vidioc_try_fmt_cap, | 1186 | .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, |
1187 | .vidioc_s_fmt_cap = vidioc_s_fmt_cap, | 1187 | .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, |
1188 | .vidioc_reqbufs = vidioc_reqbufs, | 1188 | .vidioc_reqbufs = vidioc_reqbufs, |
1189 | .vidioc_querybuf = vidioc_querybuf, | 1189 | .vidioc_querybuf = vidioc_querybuf, |
1190 | .vidioc_qbuf = vidioc_qbuf, | 1190 | .vidioc_qbuf = vidioc_qbuf, |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index eea23f95edb..0fed5cd2cce 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1045,7 +1045,7 @@ static void init_controls(struct cx88_core *core) | |||
1045 | /* ------------------------------------------------------------------ */ | 1045 | /* ------------------------------------------------------------------ */ |
1046 | /* VIDEO IOCTLS */ | 1046 | /* VIDEO IOCTLS */ |
1047 | 1047 | ||
1048 | static int vidioc_g_fmt_cap (struct file *file, void *priv, | 1048 | static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, |
1049 | struct v4l2_format *f) | 1049 | struct v4l2_format *f) |
1050 | { | 1050 | { |
1051 | struct cx8800_fh *fh = priv; | 1051 | struct cx8800_fh *fh = priv; |
@@ -1061,7 +1061,7 @@ static int vidioc_g_fmt_cap (struct file *file, void *priv, | |||
1061 | return 0; | 1061 | return 0; |
1062 | } | 1062 | } |
1063 | 1063 | ||
1064 | static int vidioc_try_fmt_cap (struct file *file, void *priv, | 1064 | static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, |
1065 | struct v4l2_format *f) | 1065 | struct v4l2_format *f) |
1066 | { | 1066 | { |
1067 | struct cx88_core *core = ((struct cx8800_fh *)priv)->dev->core; | 1067 | struct cx88_core *core = ((struct cx8800_fh *)priv)->dev->core; |
@@ -1112,11 +1112,11 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv, | |||
1112 | return 0; | 1112 | return 0; |
1113 | } | 1113 | } |
1114 | 1114 | ||
1115 | static int vidioc_s_fmt_cap (struct file *file, void *priv, | 1115 | static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, |
1116 | struct v4l2_format *f) | 1116 | struct v4l2_format *f) |
1117 | { | 1117 | { |
1118 | struct cx8800_fh *fh = priv; | 1118 | struct cx8800_fh *fh = priv; |
1119 | int err = vidioc_try_fmt_cap (file,priv,f); | 1119 | int err = vidioc_try_fmt_vid_cap (file,priv,f); |
1120 | 1120 | ||
1121 | if (0 != err) | 1121 | if (0 != err) |
1122 | return err; | 1122 | return err; |
@@ -1147,7 +1147,7 @@ static int vidioc_querycap (struct file *file, void *priv, | |||
1147 | return 0; | 1147 | return 0; |
1148 | } | 1148 | } |
1149 | 1149 | ||
1150 | static int vidioc_enum_fmt_cap (struct file *file, void *priv, | 1150 | static int vidioc_enum_fmt_vid_cap (struct file *file, void *priv, |
1151 | struct v4l2_fmtdesc *f) | 1151 | struct v4l2_fmtdesc *f) |
1152 | { | 1152 | { |
1153 | if (unlikely(f->index >= ARRAY_SIZE(formats))) | 1153 | if (unlikely(f->index >= ARRAY_SIZE(formats))) |
@@ -1690,13 +1690,13 @@ static struct video_device cx8800_video_template = | |||
1690 | .fops = &video_fops, | 1690 | .fops = &video_fops, |
1691 | .minor = -1, | 1691 | .minor = -1, |
1692 | .vidioc_querycap = vidioc_querycap, | 1692 | .vidioc_querycap = vidioc_querycap, |
1693 | .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, | 1693 | .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, |
1694 | .vidioc_g_fmt_cap = vidioc_g_fmt_cap, | 1694 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, |
1695 | .vidioc_try_fmt_cap = vidioc_try_fmt_cap, | 1695 | .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, |
1696 | .vidioc_s_fmt_cap = vidioc_s_fmt_cap, | 1696 | .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, |
1697 | .vidioc_g_fmt_vbi = cx8800_vbi_fmt, | 1697 | .vidioc_g_fmt_vbi_cap = cx8800_vbi_fmt, |
1698 | .vidioc_try_fmt_vbi = cx8800_vbi_fmt, | 1698 | .vidioc_try_fmt_vbi_cap = cx8800_vbi_fmt, |
1699 | .vidioc_s_fmt_vbi = cx8800_vbi_fmt, | 1699 | .vidioc_s_fmt_vbi_cap = cx8800_vbi_fmt, |
1700 | .vidioc_reqbufs = vidioc_reqbufs, | 1700 | .vidioc_reqbufs = vidioc_reqbufs, |
1701 | .vidioc_querybuf = vidioc_querybuf, | 1701 | .vidioc_querybuf = vidioc_querybuf, |
1702 | .vidioc_qbuf = vidioc_qbuf, | 1702 | .vidioc_qbuf = vidioc_qbuf, |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 285bc62bbe4..1c3e8b6291e 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -683,7 +683,7 @@ static void get_scale(struct em28xx *dev, | |||
683 | IOCTL vidioc handling | 683 | IOCTL vidioc handling |
684 | ------------------------------------------------------------------*/ | 684 | ------------------------------------------------------------------*/ |
685 | 685 | ||
686 | static int vidioc_g_fmt_cap(struct file *file, void *priv, | 686 | static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, |
687 | struct v4l2_format *f) | 687 | struct v4l2_format *f) |
688 | { | 688 | { |
689 | struct em28xx_fh *fh = priv; | 689 | struct em28xx_fh *fh = priv; |
@@ -706,7 +706,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv, | |||
706 | return 0; | 706 | return 0; |
707 | } | 707 | } |
708 | 708 | ||
709 | static int vidioc_try_fmt_cap(struct file *file, void *priv, | 709 | static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, |
710 | struct v4l2_format *f) | 710 | struct v4l2_format *f) |
711 | { | 711 | { |
712 | struct em28xx_fh *fh = priv; | 712 | struct em28xx_fh *fh = priv; |
@@ -766,7 +766,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv, | |||
766 | return 0; | 766 | return 0; |
767 | } | 767 | } |
768 | 768 | ||
769 | static int vidioc_s_fmt_cap(struct file *file, void *priv, | 769 | static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, |
770 | struct v4l2_format *f) | 770 | struct v4l2_format *f) |
771 | { | 771 | { |
772 | struct em28xx_fh *fh = priv; | 772 | struct em28xx_fh *fh = priv; |
@@ -777,7 +777,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, | |||
777 | if (rc < 0) | 777 | if (rc < 0) |
778 | return rc; | 778 | return rc; |
779 | 779 | ||
780 | vidioc_try_fmt_cap(file, priv, f); | 780 | vidioc_try_fmt_vid_cap(file, priv, f); |
781 | 781 | ||
782 | mutex_lock(&dev->lock); | 782 | mutex_lock(&dev->lock); |
783 | 783 | ||
@@ -826,7 +826,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * norm) | |||
826 | /* Adjusts width/height, if needed */ | 826 | /* Adjusts width/height, if needed */ |
827 | f.fmt.pix.width = dev->width; | 827 | f.fmt.pix.width = dev->width; |
828 | f.fmt.pix.height = dev->height; | 828 | f.fmt.pix.height = dev->height; |
829 | vidioc_try_fmt_cap(file, priv, &f); | 829 | vidioc_try_fmt_vid_cap(file, priv, &f); |
830 | 830 | ||
831 | mutex_lock(&dev->lock); | 831 | mutex_lock(&dev->lock); |
832 | 832 | ||
@@ -1277,7 +1277,7 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
1277 | return 0; | 1277 | return 0; |
1278 | } | 1278 | } |
1279 | 1279 | ||
1280 | static int vidioc_enum_fmt_cap(struct file *file, void *priv, | 1280 | static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, |
1281 | struct v4l2_fmtdesc *fmtd) | 1281 | struct v4l2_fmtdesc *fmtd) |
1282 | { | 1282 | { |
1283 | if (fmtd->index != 0) | 1283 | if (fmtd->index != 0) |
@@ -1292,7 +1292,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *priv, | |||
1292 | } | 1292 | } |
1293 | 1293 | ||
1294 | /* Sliced VBI ioctls */ | 1294 | /* Sliced VBI ioctls */ |
1295 | static int vidioc_g_fmt_vbi_capture(struct file *file, void *priv, | 1295 | static int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv, |
1296 | struct v4l2_format *f) | 1296 | struct v4l2_format *f) |
1297 | { | 1297 | { |
1298 | struct em28xx_fh *fh = priv; | 1298 | struct em28xx_fh *fh = priv; |
@@ -1316,7 +1316,7 @@ static int vidioc_g_fmt_vbi_capture(struct file *file, void *priv, | |||
1316 | return rc; | 1316 | return rc; |
1317 | } | 1317 | } |
1318 | 1318 | ||
1319 | static int vidioc_try_set_vbi_capture(struct file *file, void *priv, | 1319 | static int vidioc_try_set_sliced_vbi_cap(struct file *file, void *priv, |
1320 | struct v4l2_format *f) | 1320 | struct v4l2_format *f) |
1321 | { | 1321 | { |
1322 | struct em28xx_fh *fh = priv; | 1322 | struct em28xx_fh *fh = priv; |
@@ -1776,17 +1776,17 @@ static const struct video_device em28xx_video_template = { | |||
1776 | 1776 | ||
1777 | .minor = -1, | 1777 | .minor = -1, |
1778 | .vidioc_querycap = vidioc_querycap, | 1778 | .vidioc_querycap = vidioc_querycap, |
1779 | .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, | 1779 | .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, |
1780 | .vidioc_g_fmt_cap = vidioc_g_fmt_cap, | 1780 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, |
1781 | .vidioc_try_fmt_cap = vidioc_try_fmt_cap, | 1781 | .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, |
1782 | .vidioc_s_fmt_cap = vidioc_s_fmt_cap, | 1782 | .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, |
1783 | .vidioc_g_audio = vidioc_g_audio, | 1783 | .vidioc_g_audio = vidioc_g_audio, |
1784 | .vidioc_s_audio = vidioc_s_audio, | 1784 | .vidioc_s_audio = vidioc_s_audio, |
1785 | .vidioc_cropcap = vidioc_cropcap, | 1785 | .vidioc_cropcap = vidioc_cropcap, |
1786 | 1786 | ||
1787 | .vidioc_g_fmt_vbi_capture = vidioc_g_fmt_vbi_capture, | 1787 | .vidioc_g_fmt_sliced_vbi_cap = vidioc_g_fmt_sliced_vbi_cap, |
1788 | .vidioc_try_fmt_vbi_capture = vidioc_try_set_vbi_capture, | 1788 | .vidioc_try_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap, |
1789 | .vidioc_s_fmt_vbi_capture = vidioc_try_set_vbi_capture, | 1789 | .vidioc_s_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap, |
1790 | 1790 | ||
1791 | .vidioc_reqbufs = vidioc_reqbufs, | 1791 | .vidioc_reqbufs = vidioc_reqbufs, |
1792 | .vidioc_querybuf = vidioc_querybuf, | 1792 | .vidioc_querybuf = vidioc_querybuf, |
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index e7ccbc895d7..2fb5854cf6f 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
@@ -1253,7 +1253,7 @@ static int vidioc_g_ctrl(struct file *file, void *fh, struct v4l2_control *c) | |||
1253 | return 0; | 1253 | return 0; |
1254 | } | 1254 | } |
1255 | 1255 | ||
1256 | static int vidioc_enum_fmt_cap(struct file *file, void *fh, | 1256 | static int vidioc_enum_fmt_vid_cap(struct file *file, void *fh, |
1257 | struct v4l2_fmtdesc *f) | 1257 | struct v4l2_fmtdesc *f) |
1258 | { | 1258 | { |
1259 | if (f->index > 1) | 1259 | if (f->index > 1) |
@@ -1283,7 +1283,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *fh, | |||
1283 | return 0; | 1283 | return 0; |
1284 | } | 1284 | } |
1285 | 1285 | ||
1286 | static int vidioc_try_fmt_cap(struct file *file, void *fh, | 1286 | static int vidioc_try_fmt_vid_cap(struct file *file, void *fh, |
1287 | struct v4l2_format *f) | 1287 | struct v4l2_format *f) |
1288 | { | 1288 | { |
1289 | if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | 1289 | if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) |
@@ -1316,7 +1316,8 @@ static int vidioc_try_fmt_cap(struct file *file, void *fh, | |||
1316 | return 0; | 1316 | return 0; |
1317 | } | 1317 | } |
1318 | 1318 | ||
1319 | static int vidioc_g_fmt_cap(struct file *file, void *fh, struct v4l2_format *f) | 1319 | static int vidioc_g_fmt_vid_cap(struct file *file, void *fh, |
1320 | struct v4l2_format *f) | ||
1320 | { | 1321 | { |
1321 | if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | 1322 | if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) |
1322 | return -EINVAL; | 1323 | return -EINVAL; |
@@ -1346,7 +1347,8 @@ static int vidioc_g_fmt_cap(struct file *file, void *fh, struct v4l2_format *f) | |||
1346 | return 0; | 1347 | return 0; |
1347 | } | 1348 | } |
1348 | 1349 | ||
1349 | static int vidioc_s_fmt_cap(struct file *file, void *fh, struct v4l2_format *f) | 1350 | static int vidioc_s_fmt_vid_cap(struct file *file, void *fh, |
1351 | struct v4l2_format *f) | ||
1350 | { | 1352 | { |
1351 | if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | 1353 | if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) |
1352 | return -EINVAL; | 1354 | return -EINVAL; |
@@ -1709,10 +1711,10 @@ static struct video_device meye_template = { | |||
1709 | .vidioc_queryctrl = vidioc_queryctrl, | 1711 | .vidioc_queryctrl = vidioc_queryctrl, |
1710 | .vidioc_s_ctrl = vidioc_s_ctrl, | 1712 | .vidioc_s_ctrl = vidioc_s_ctrl, |
1711 | .vidioc_g_ctrl = vidioc_g_ctrl, | 1713 | .vidioc_g_ctrl = vidioc_g_ctrl, |
1712 | .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, | 1714 | .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, |
1713 | .vidioc_try_fmt_cap = vidioc_try_fmt_cap, | 1715 | .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, |
1714 | .vidioc_g_fmt_cap = vidioc_g_fmt_cap, | 1716 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, |
1715 | .vidioc_s_fmt_cap = vidioc_s_fmt_cap, | 1717 | .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, |
1716 | .vidioc_reqbufs = vidioc_reqbufs, | 1718 | .vidioc_reqbufs = vidioc_reqbufs, |
1717 | .vidioc_querybuf = vidioc_querybuf, | 1719 | .vidioc_querybuf = vidioc_querybuf, |
1718 | .vidioc_qbuf = vidioc_qbuf, | 1720 | .vidioc_qbuf = vidioc_qbuf, |
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index 3ae71a34082..e11700eb3e5 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -208,7 +208,7 @@ static int empress_s_input(struct file *file, void *priv, unsigned int i) | |||
208 | return 0; | 208 | return 0; |
209 | } | 209 | } |
210 | 210 | ||
211 | static int empress_enum_fmt_cap(struct file *file, void *priv, | 211 | static int empress_enum_fmt_vid_cap(struct file *file, void *priv, |
212 | struct v4l2_fmtdesc *f) | 212 | struct v4l2_fmtdesc *f) |
213 | { | 213 | { |
214 | if (f->index != 0) | 214 | if (f->index != 0) |
@@ -220,7 +220,7 @@ static int empress_enum_fmt_cap(struct file *file, void *priv, | |||
220 | return 0; | 220 | return 0; |
221 | } | 221 | } |
222 | 222 | ||
223 | static int empress_g_fmt_cap(struct file *file, void *priv, | 223 | static int empress_g_fmt_vid_cap(struct file *file, void *priv, |
224 | struct v4l2_format *f) | 224 | struct v4l2_format *f) |
225 | { | 225 | { |
226 | struct saa7134_dev *dev = file->private_data; | 226 | struct saa7134_dev *dev = file->private_data; |
@@ -233,7 +233,7 @@ static int empress_g_fmt_cap(struct file *file, void *priv, | |||
233 | return 0; | 233 | return 0; |
234 | } | 234 | } |
235 | 235 | ||
236 | static int empress_s_fmt_cap(struct file *file, void *priv, | 236 | static int empress_s_fmt_vid_cap(struct file *file, void *priv, |
237 | struct v4l2_format *f) | 237 | struct v4l2_format *f) |
238 | { | 238 | { |
239 | struct saa7134_dev *dev = file->private_data; | 239 | struct saa7134_dev *dev = file->private_data; |
@@ -348,9 +348,9 @@ static struct video_device saa7134_empress_template = | |||
348 | .minor = -1, | 348 | .minor = -1, |
349 | 349 | ||
350 | .vidioc_querycap = empress_querycap, | 350 | .vidioc_querycap = empress_querycap, |
351 | .vidioc_enum_fmt_cap = empress_enum_fmt_cap, | 351 | .vidioc_enum_fmt_vid_cap = empress_enum_fmt_vid_cap, |
352 | .vidioc_s_fmt_cap = empress_s_fmt_cap, | 352 | .vidioc_s_fmt_vid_cap = empress_s_fmt_vid_cap, |
353 | .vidioc_g_fmt_cap = empress_g_fmt_cap, | 353 | .vidioc_g_fmt_vid_cap = empress_g_fmt_vid_cap, |
354 | .vidioc_reqbufs = empress_reqbufs, | 354 | .vidioc_reqbufs = empress_reqbufs, |
355 | .vidioc_querybuf = empress_querybuf, | 355 | .vidioc_querybuf = empress_querybuf, |
356 | .vidioc_qbuf = empress_qbuf, | 356 | .vidioc_qbuf = empress_qbuf, |
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 48e1a01718e..bba23219ce9 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -1496,7 +1496,7 @@ static int video_mmap(struct file *file, struct vm_area_struct * vma) | |||
1496 | 1496 | ||
1497 | /* ------------------------------------------------------------------ */ | 1497 | /* ------------------------------------------------------------------ */ |
1498 | 1498 | ||
1499 | static int saa7134_try_get_set_fmt_vbi(struct file *file, void *priv, | 1499 | static int saa7134_try_get_set_fmt_vbi_cap(struct file *file, void *priv, |
1500 | struct v4l2_format *f) | 1500 | struct v4l2_format *f) |
1501 | { | 1501 | { |
1502 | struct saa7134_fh *fh = priv; | 1502 | struct saa7134_fh *fh = priv; |
@@ -1516,7 +1516,7 @@ static int saa7134_try_get_set_fmt_vbi(struct file *file, void *priv, | |||
1516 | return 0; | 1516 | return 0; |
1517 | } | 1517 | } |
1518 | 1518 | ||
1519 | static int saa7134_g_fmt_cap(struct file *file, void *priv, | 1519 | static int saa7134_g_fmt_vid_cap(struct file *file, void *priv, |
1520 | struct v4l2_format *f) | 1520 | struct v4l2_format *f) |
1521 | { | 1521 | { |
1522 | struct saa7134_fh *fh = priv; | 1522 | struct saa7134_fh *fh = priv; |
@@ -1532,7 +1532,7 @@ static int saa7134_g_fmt_cap(struct file *file, void *priv, | |||
1532 | return 0; | 1532 | return 0; |
1533 | } | 1533 | } |
1534 | 1534 | ||
1535 | static int saa7134_g_fmt_overlay(struct file *file, void *priv, | 1535 | static int saa7134_g_fmt_vid_overlay(struct file *file, void *priv, |
1536 | struct v4l2_format *f) | 1536 | struct v4l2_format *f) |
1537 | { | 1537 | { |
1538 | struct saa7134_fh *fh = priv; | 1538 | struct saa7134_fh *fh = priv; |
@@ -1546,7 +1546,7 @@ static int saa7134_g_fmt_overlay(struct file *file, void *priv, | |||
1546 | return 0; | 1546 | return 0; |
1547 | } | 1547 | } |
1548 | 1548 | ||
1549 | static int saa7134_try_fmt_cap(struct file *file, void *priv, | 1549 | static int saa7134_try_fmt_vid_cap(struct file *file, void *priv, |
1550 | struct v4l2_format *f) | 1550 | struct v4l2_format *f) |
1551 | { | 1551 | { |
1552 | struct saa7134_fh *fh = priv; | 1552 | struct saa7134_fh *fh = priv; |
@@ -1597,7 +1597,7 @@ static int saa7134_try_fmt_cap(struct file *file, void *priv, | |||
1597 | return 0; | 1597 | return 0; |
1598 | } | 1598 | } |
1599 | 1599 | ||
1600 | static int saa7134_try_fmt_overlay(struct file *file, void *priv, | 1600 | static int saa7134_try_fmt_vid_overlay(struct file *file, void *priv, |
1601 | struct v4l2_format *f) | 1601 | struct v4l2_format *f) |
1602 | { | 1602 | { |
1603 | struct saa7134_fh *fh = priv; | 1603 | struct saa7134_fh *fh = priv; |
@@ -1611,13 +1611,13 @@ static int saa7134_try_fmt_overlay(struct file *file, void *priv, | |||
1611 | return verify_preview(dev, &f->fmt.win); | 1611 | return verify_preview(dev, &f->fmt.win); |
1612 | } | 1612 | } |
1613 | 1613 | ||
1614 | static int saa7134_s_fmt_cap(struct file *file, void *priv, | 1614 | static int saa7134_s_fmt_vid_cap(struct file *file, void *priv, |
1615 | struct v4l2_format *f) | 1615 | struct v4l2_format *f) |
1616 | { | 1616 | { |
1617 | struct saa7134_fh *fh = priv; | 1617 | struct saa7134_fh *fh = priv; |
1618 | int err; | 1618 | int err; |
1619 | 1619 | ||
1620 | err = saa7134_try_fmt_cap(file, priv, f); | 1620 | err = saa7134_try_fmt_vid_cap(file, priv, f); |
1621 | if (0 != err) | 1621 | if (0 != err) |
1622 | return err; | 1622 | return err; |
1623 | 1623 | ||
@@ -1628,7 +1628,7 @@ static int saa7134_s_fmt_cap(struct file *file, void *priv, | |||
1628 | return 0; | 1628 | return 0; |
1629 | } | 1629 | } |
1630 | 1630 | ||
1631 | static int saa7134_s_fmt_overlay(struct file *file, void *priv, | 1631 | static int saa7134_s_fmt_vid_overlay(struct file *file, void *priv, |
1632 | struct v4l2_format *f) | 1632 | struct v4l2_format *f) |
1633 | { | 1633 | { |
1634 | struct saa7134_fh *fh = priv; | 1634 | struct saa7134_fh *fh = priv; |
@@ -2028,7 +2028,7 @@ static int saa7134_s_priority(struct file *file, void *f, | |||
2028 | return v4l2_prio_change(&dev->prio, &fh->prio, prio); | 2028 | return v4l2_prio_change(&dev->prio, &fh->prio, prio); |
2029 | } | 2029 | } |
2030 | 2030 | ||
2031 | static int saa7134_enum_fmt_cap(struct file *file, void *priv, | 2031 | static int saa7134_enum_fmt_vid_cap(struct file *file, void *priv, |
2032 | struct v4l2_fmtdesc *f) | 2032 | struct v4l2_fmtdesc *f) |
2033 | { | 2033 | { |
2034 | if (f->index >= FORMATS) | 2034 | if (f->index >= FORMATS) |
@@ -2042,7 +2042,7 @@ static int saa7134_enum_fmt_cap(struct file *file, void *priv, | |||
2042 | return 0; | 2042 | return 0; |
2043 | } | 2043 | } |
2044 | 2044 | ||
2045 | static int saa7134_enum_fmt_overlay(struct file *file, void *priv, | 2045 | static int saa7134_enum_fmt_vid_overlay(struct file *file, void *priv, |
2046 | struct v4l2_fmtdesc *f) | 2046 | struct v4l2_fmtdesc *f) |
2047 | { | 2047 | { |
2048 | if (saa7134_no_overlay > 0) { | 2048 | if (saa7134_no_overlay > 0) { |
@@ -2061,7 +2061,7 @@ static int saa7134_enum_fmt_overlay(struct file *file, void *priv, | |||
2061 | return 0; | 2061 | return 0; |
2062 | } | 2062 | } |
2063 | 2063 | ||
2064 | static int saa7134_enum_fmt_vbi(struct file *file, void *priv, | 2064 | static int saa7134_enum_fmt_vbi_cap(struct file *file, void *priv, |
2065 | struct v4l2_fmtdesc *f) | 2065 | struct v4l2_fmtdesc *f) |
2066 | { | 2066 | { |
2067 | if (0 != f->index) | 2067 | if (0 != f->index) |
@@ -2348,18 +2348,18 @@ struct video_device saa7134_video_template = | |||
2348 | .fops = &video_fops, | 2348 | .fops = &video_fops, |
2349 | .minor = -1, | 2349 | .minor = -1, |
2350 | .vidioc_querycap = saa7134_querycap, | 2350 | .vidioc_querycap = saa7134_querycap, |
2351 | .vidioc_enum_fmt_cap = saa7134_enum_fmt_cap, | 2351 | .vidioc_enum_fmt_vid_cap = saa7134_enum_fmt_vid_cap, |
2352 | .vidioc_g_fmt_cap = saa7134_g_fmt_cap, | 2352 | .vidioc_g_fmt_vid_cap = saa7134_g_fmt_vid_cap, |
2353 | .vidioc_try_fmt_cap = saa7134_try_fmt_cap, | 2353 | .vidioc_try_fmt_vid_cap = saa7134_try_fmt_vid_cap, |
2354 | .vidioc_s_fmt_cap = saa7134_s_fmt_cap, | 2354 | .vidioc_s_fmt_vid_cap = saa7134_s_fmt_vid_cap, |
2355 | .vidioc_enum_fmt_overlay = saa7134_enum_fmt_overlay, | 2355 | .vidioc_enum_fmt_vid_overlay = saa7134_enum_fmt_vid_overlay, |
2356 | .vidioc_g_fmt_overlay = saa7134_g_fmt_overlay, | 2356 | .vidioc_g_fmt_vid_overlay = saa7134_g_fmt_vid_overlay, |
2357 | .vidioc_try_fmt_overlay = saa7134_try_fmt_overlay, | 2357 | .vidioc_try_fmt_vid_overlay = saa7134_try_fmt_vid_overlay, |
2358 | .vidioc_s_fmt_overlay = saa7134_s_fmt_overlay, | 2358 | .vidioc_s_fmt_vid_overlay = saa7134_s_fmt_vid_overlay, |
2359 | .vidioc_enum_fmt_vbi = saa7134_enum_fmt_vbi, | 2359 | .vidioc_enum_fmt_vbi_cap = saa7134_enum_fmt_vbi_cap, |
2360 | .vidioc_g_fmt_vbi = saa7134_try_get_set_fmt_vbi, | 2360 | .vidioc_g_fmt_vbi_cap = saa7134_try_get_set_fmt_vbi_cap, |
2361 | .vidioc_try_fmt_vbi = saa7134_try_get_set_fmt_vbi, | 2361 | .vidioc_try_fmt_vbi_cap = saa7134_try_get_set_fmt_vbi_cap, |
2362 | .vidioc_s_fmt_vbi = saa7134_try_get_set_fmt_vbi, | 2362 | .vidioc_s_fmt_vbi_cap = saa7134_try_get_set_fmt_vbi_cap, |
2363 | .vidioc_g_audio = saa7134_g_audio, | 2363 | .vidioc_g_audio = saa7134_g_audio, |
2364 | .vidioc_s_audio = saa7134_s_audio, | 2364 | .vidioc_s_audio = saa7134_s_audio, |
2365 | .vidioc_cropcap = saa7134_cropcap, | 2365 | .vidioc_cropcap = saa7134_cropcap, |
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c index b12c60cf5a0..f308c38d744 100644 --- a/drivers/media/video/stk-webcam.c +++ b/drivers/media/video/stk-webcam.c | |||
@@ -981,7 +981,7 @@ static int stk_vidioc_s_ctrl(struct file *filp, | |||
981 | } | 981 | } |
982 | 982 | ||
983 | 983 | ||
984 | static int stk_vidioc_enum_fmt_cap(struct file *filp, | 984 | static int stk_vidioc_enum_fmt_vid_cap(struct file *filp, |
985 | void *priv, struct v4l2_fmtdesc *fmtd) | 985 | void *priv, struct v4l2_fmtdesc *fmtd) |
986 | { | 986 | { |
987 | fmtd->flags = 0; | 987 | fmtd->flags = 0; |
@@ -1025,7 +1025,7 @@ static struct stk_size { | |||
1025 | { .w = 176, .h = 144, .m = MODE_QCIF, }, | 1025 | { .w = 176, .h = 144, .m = MODE_QCIF, }, |
1026 | }; | 1026 | }; |
1027 | 1027 | ||
1028 | static int stk_vidioc_g_fmt_cap(struct file *filp, | 1028 | static int stk_vidioc_g_fmt_vid_cap(struct file *filp, |
1029 | void *priv, struct v4l2_format *f) | 1029 | void *priv, struct v4l2_format *f) |
1030 | { | 1030 | { |
1031 | struct v4l2_pix_format *pix_format = &f->fmt.pix; | 1031 | struct v4l2_pix_format *pix_format = &f->fmt.pix; |
@@ -1054,7 +1054,7 @@ static int stk_vidioc_g_fmt_cap(struct file *filp, | |||
1054 | return 0; | 1054 | return 0; |
1055 | } | 1055 | } |
1056 | 1056 | ||
1057 | static int stk_vidioc_try_fmt_cap(struct file *filp, | 1057 | static int stk_vidioc_try_fmt_vid_cap(struct file *filp, |
1058 | void *priv, struct v4l2_format *fmtd) | 1058 | void *priv, struct v4l2_format *fmtd) |
1059 | { | 1059 | { |
1060 | int i; | 1060 | int i; |
@@ -1131,7 +1131,7 @@ static int stk_setup_format(struct stk_camera *dev) | |||
1131 | return stk_sensor_configure(dev); | 1131 | return stk_sensor_configure(dev); |
1132 | } | 1132 | } |
1133 | 1133 | ||
1134 | static int stk_vidioc_s_fmt_cap(struct file *filp, | 1134 | static int stk_vidioc_s_fmt_vid_cap(struct file *filp, |
1135 | void *priv, struct v4l2_format *fmtd) | 1135 | void *priv, struct v4l2_format *fmtd) |
1136 | { | 1136 | { |
1137 | int ret; | 1137 | int ret; |
@@ -1145,7 +1145,7 @@ static int stk_vidioc_s_fmt_cap(struct file *filp, | |||
1145 | return -EBUSY; | 1145 | return -EBUSY; |
1146 | if (dev->owner && dev->owner != filp) | 1146 | if (dev->owner && dev->owner != filp) |
1147 | return -EBUSY; | 1147 | return -EBUSY; |
1148 | ret = stk_vidioc_try_fmt_cap(filp, priv, fmtd); | 1148 | ret = stk_vidioc_try_fmt_vid_cap(filp, priv, fmtd); |
1149 | if (ret) | 1149 | if (ret) |
1150 | return ret; | 1150 | return ret; |
1151 | dev->owner = filp; | 1151 | dev->owner = filp; |
@@ -1342,10 +1342,10 @@ static struct video_device stk_v4l_data = { | |||
1342 | .release = stk_v4l_dev_release, | 1342 | .release = stk_v4l_dev_release, |
1343 | 1343 | ||
1344 | .vidioc_querycap = stk_vidioc_querycap, | 1344 | .vidioc_querycap = stk_vidioc_querycap, |
1345 | .vidioc_enum_fmt_cap = stk_vidioc_enum_fmt_cap, | 1345 | .vidioc_enum_fmt_vid_cap = stk_vidioc_enum_fmt_vid_cap, |
1346 | .vidioc_try_fmt_cap = stk_vidioc_try_fmt_cap, | 1346 | .vidioc_try_fmt_vid_cap = stk_vidioc_try_fmt_vid_cap, |
1347 | .vidioc_s_fmt_cap = stk_vidioc_s_fmt_cap, | 1347 | .vidioc_s_fmt_vid_cap = stk_vidioc_s_fmt_vid_cap, |
1348 | .vidioc_g_fmt_cap = stk_vidioc_g_fmt_cap, | 1348 | .vidioc_g_fmt_vid_cap = stk_vidioc_g_fmt_vid_cap, |
1349 | .vidioc_enum_input = stk_vidioc_enum_input, | 1349 | .vidioc_enum_input = stk_vidioc_enum_input, |
1350 | .vidioc_s_input = stk_vidioc_s_input, | 1350 | .vidioc_s_input = stk_vidioc_s_input, |
1351 | .vidioc_g_input = stk_vidioc_g_input, | 1351 | .vidioc_g_input = stk_vidioc_g_input, |
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index d97261ab430..a9e5e08caec 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -998,7 +998,7 @@ static int vidioc_streamoff(struct file *file, | |||
998 | return 0; | 998 | return 0; |
999 | } | 999 | } |
1000 | 1000 | ||
1001 | static int vidioc_enum_fmt_cap (struct file *file, void *priv, | 1001 | static int vidioc_enum_fmt_vid_cap (struct file *file, void *priv, |
1002 | struct v4l2_fmtdesc *vfd) | 1002 | struct v4l2_fmtdesc *vfd) |
1003 | { | 1003 | { |
1004 | if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) { | 1004 | if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) { |
@@ -1012,7 +1012,7 @@ static int vidioc_enum_fmt_cap (struct file *file, void *priv, | |||
1012 | return 0; | 1012 | return 0; |
1013 | } | 1013 | } |
1014 | 1014 | ||
1015 | static int vidioc_g_fmt_cap (struct file *file, void *priv, | 1015 | static int vidioc_g_fmt_vid_cap (struct file *file, void *priv, |
1016 | struct v4l2_format *vf) | 1016 | struct v4l2_format *vf) |
1017 | { | 1017 | { |
1018 | struct video_device *dev = video_devdata(file); | 1018 | struct video_device *dev = video_devdata(file); |
@@ -1030,7 +1030,7 @@ static int vidioc_g_fmt_cap (struct file *file, void *priv, | |||
1030 | return 0; | 1030 | return 0; |
1031 | } | 1031 | } |
1032 | 1032 | ||
1033 | static int vidioc_try_fmt_cap (struct file *file, void *priv, | 1033 | static int vidioc_try_fmt_vid_cap (struct file *file, void *priv, |
1034 | struct v4l2_format *vf) | 1034 | struct v4l2_format *vf) |
1035 | { | 1035 | { |
1036 | struct video_device *dev = video_devdata(file); | 1036 | struct video_device *dev = video_devdata(file); |
@@ -1060,7 +1060,7 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv, | |||
1060 | return 0; | 1060 | return 0; |
1061 | } | 1061 | } |
1062 | 1062 | ||
1063 | static int vidioc_s_fmt_cap(struct file *file, void *priv, | 1063 | static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, |
1064 | struct v4l2_format *vf) | 1064 | struct v4l2_format *vf) |
1065 | { | 1065 | { |
1066 | struct video_device *dev = video_devdata(file); | 1066 | struct video_device *dev = video_devdata(file); |
@@ -1068,7 +1068,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, | |||
1068 | (struct usb_usbvision *) video_get_drvdata(dev); | 1068 | (struct usb_usbvision *) video_get_drvdata(dev); |
1069 | int ret; | 1069 | int ret; |
1070 | 1070 | ||
1071 | if( 0 != (ret=vidioc_try_fmt_cap (file, priv, vf)) ) { | 1071 | if( 0 != (ret=vidioc_try_fmt_vid_cap (file, priv, vf)) ) { |
1072 | return ret; | 1072 | return ret; |
1073 | } | 1073 | } |
1074 | 1074 | ||
@@ -1407,10 +1407,10 @@ static struct video_device usbvision_video_template = { | |||
1407 | .release = video_device_release, | 1407 | .release = video_device_release, |
1408 | .minor = -1, | 1408 | .minor = -1, |
1409 | .vidioc_querycap = vidioc_querycap, | 1409 | .vidioc_querycap = vidioc_querycap, |
1410 | .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, | 1410 | .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, |
1411 | .vidioc_g_fmt_cap = vidioc_g_fmt_cap, | 1411 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, |
1412 | .vidioc_try_fmt_cap = vidioc_try_fmt_cap, | 1412 | .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, |
1413 | .vidioc_s_fmt_cap = vidioc_s_fmt_cap, | 1413 | .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, |
1414 | .vidioc_reqbufs = vidioc_reqbufs, | 1414 | .vidioc_reqbufs = vidioc_reqbufs, |
1415 | .vidioc_querybuf = vidioc_querybuf, | 1415 | .vidioc_querybuf = vidioc_querybuf, |
1416 | .vidioc_qbuf = vidioc_qbuf, | 1416 | .vidioc_qbuf = vidioc_qbuf, |
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 83106bba100..6cf6ad7193d 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
@@ -683,35 +683,35 @@ static int check_fmt (struct video_device *vfd, enum v4l2_buf_type type) | |||
683 | { | 683 | { |
684 | switch (type) { | 684 | switch (type) { |
685 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 685 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
686 | if (vfd->vidioc_try_fmt_cap) | 686 | if (vfd->vidioc_try_fmt_vid_cap) |
687 | return (0); | 687 | return (0); |
688 | break; | 688 | break; |
689 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 689 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
690 | if (vfd->vidioc_try_fmt_overlay) | 690 | if (vfd->vidioc_try_fmt_vid_overlay) |
691 | return (0); | 691 | return (0); |
692 | break; | 692 | break; |
693 | case V4L2_BUF_TYPE_VBI_CAPTURE: | 693 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: |
694 | if (vfd->vidioc_try_fmt_vbi) | 694 | if (vfd->vidioc_try_fmt_vid_out) |
695 | return (0); | 695 | return (0); |
696 | break; | 696 | break; |
697 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | 697 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: |
698 | if (vfd->vidioc_try_fmt_vbi_output) | 698 | if (vfd->vidioc_try_fmt_vid_out_overlay) |
699 | return (0); | 699 | return (0); |
700 | break; | 700 | break; |
701 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | 701 | case V4L2_BUF_TYPE_VBI_CAPTURE: |
702 | if (vfd->vidioc_try_fmt_vbi_capture) | 702 | if (vfd->vidioc_try_fmt_vbi_cap) |
703 | return (0); | 703 | return (0); |
704 | break; | 704 | break; |
705 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | 705 | case V4L2_BUF_TYPE_VBI_OUTPUT: |
706 | if (vfd->vidioc_try_fmt_video_output) | 706 | if (vfd->vidioc_try_fmt_vbi_out) |
707 | return (0); | 707 | return (0); |
708 | break; | 708 | break; |
709 | case V4L2_BUF_TYPE_VBI_OUTPUT: | 709 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: |
710 | if (vfd->vidioc_try_fmt_vbi_output) | 710 | if (vfd->vidioc_try_fmt_sliced_vbi_cap) |
711 | return (0); | 711 | return (0); |
712 | break; | 712 | break; |
713 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 713 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: |
714 | if (vfd->vidioc_try_fmt_output_overlay) | 714 | if (vfd->vidioc_try_fmt_sliced_vbi_out) |
715 | return (0); | 715 | return (0); |
716 | break; | 716 | break; |
717 | case V4L2_BUF_TYPE_PRIVATE: | 717 | case V4L2_BUF_TYPE_PRIVATE: |
@@ -828,46 +828,37 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, | |||
828 | 828 | ||
829 | switch (type) { | 829 | switch (type) { |
830 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 830 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
831 | if (vfd->vidioc_enum_fmt_cap) | 831 | if (vfd->vidioc_enum_fmt_vid_cap) |
832 | ret=vfd->vidioc_enum_fmt_cap(file, fh, f); | 832 | ret = vfd->vidioc_enum_fmt_vid_cap(file, fh, f); |
833 | break; | 833 | break; |
834 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 834 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
835 | if (vfd->vidioc_enum_fmt_overlay) | 835 | if (vfd->vidioc_enum_fmt_vid_overlay) |
836 | ret=vfd->vidioc_enum_fmt_overlay(file, fh, f); | 836 | ret = vfd->vidioc_enum_fmt_vid_overlay(file, |
837 | fh, f); | ||
837 | break; | 838 | break; |
839 | #if 1 | ||
840 | /* V4L2_BUF_TYPE_VBI_CAPTURE should not support VIDIOC_ENUM_FMT | ||
841 | * according to the spec. The bttv and saa7134 drivers support | ||
842 | * it though, so just warn that this is deprecated and will be | ||
843 | * removed in the near future. */ | ||
838 | case V4L2_BUF_TYPE_VBI_CAPTURE: | 844 | case V4L2_BUF_TYPE_VBI_CAPTURE: |
839 | if (vfd->vidioc_enum_fmt_vbi) | 845 | if (vfd->vidioc_enum_fmt_vbi_cap) { |
840 | ret=vfd->vidioc_enum_fmt_vbi(file, fh, f); | 846 | printk(KERN_WARNING "vidioc_enum_fmt_vbi_cap will be removed in 2.6.28!\n"); |
841 | break; | 847 | ret = vfd->vidioc_enum_fmt_vbi_cap(file, fh, f); |
842 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | 848 | } |
843 | if (vfd->vidioc_enum_fmt_sliced_vbi_output) | ||
844 | ret = vfd->vidioc_enum_fmt_sliced_vbi_output(file, | ||
845 | fh, f); | ||
846 | break; | ||
847 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | ||
848 | if (vfd->vidioc_enum_fmt_vbi_capture) | ||
849 | ret=vfd->vidioc_enum_fmt_vbi_capture(file, | ||
850 | fh, f); | ||
851 | break; | 849 | break; |
850 | #endif | ||
852 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | 851 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: |
853 | if (vfd->vidioc_enum_fmt_video_output) | 852 | if (vfd->vidioc_enum_fmt_vid_out) |
854 | ret=vfd->vidioc_enum_fmt_video_output(file, | 853 | ret = vfd->vidioc_enum_fmt_vid_out(file, fh, f); |
855 | fh, f); | ||
856 | break; | ||
857 | case V4L2_BUF_TYPE_VBI_OUTPUT: | ||
858 | if (vfd->vidioc_enum_fmt_vbi_output) | ||
859 | ret=vfd->vidioc_enum_fmt_vbi_output(file, | ||
860 | fh, f); | ||
861 | break; | ||
862 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | ||
863 | if (vfd->vidioc_enum_fmt_output_overlay) | ||
864 | ret=vfd->vidioc_enum_fmt_output_overlay(file, fh, f); | ||
865 | break; | 854 | break; |
866 | case V4L2_BUF_TYPE_PRIVATE: | 855 | case V4L2_BUF_TYPE_PRIVATE: |
867 | if (vfd->vidioc_enum_fmt_type_private) | 856 | if (vfd->vidioc_enum_fmt_type_private) |
868 | ret=vfd->vidioc_enum_fmt_type_private(file, | 857 | ret = vfd->vidioc_enum_fmt_type_private(file, |
869 | fh, f); | 858 | fh, f); |
870 | break; | 859 | break; |
860 | default: | ||
861 | break; | ||
871 | } | 862 | } |
872 | if (!ret) | 863 | if (!ret) |
873 | dbgarg (cmd, "index=%d, type=%d, flags=%d, " | 864 | dbgarg (cmd, "index=%d, type=%d, flags=%d, " |
@@ -891,43 +882,46 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, | |||
891 | 882 | ||
892 | switch (f->type) { | 883 | switch (f->type) { |
893 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 884 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
894 | if (vfd->vidioc_g_fmt_cap) | 885 | if (vfd->vidioc_g_fmt_vid_cap) |
895 | ret=vfd->vidioc_g_fmt_cap(file, fh, f); | 886 | ret = vfd->vidioc_g_fmt_vid_cap(file, fh, f); |
896 | if (!ret) | 887 | if (!ret) |
897 | v4l_print_pix_fmt(vfd,&f->fmt.pix); | 888 | v4l_print_pix_fmt(vfd,&f->fmt.pix); |
898 | break; | 889 | break; |
899 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 890 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
900 | if (vfd->vidioc_g_fmt_overlay) | 891 | if (vfd->vidioc_g_fmt_vid_overlay) |
901 | ret=vfd->vidioc_g_fmt_overlay(file, fh, f); | 892 | ret = vfd->vidioc_g_fmt_vid_overlay(file, |
902 | break; | 893 | fh, f); |
903 | case V4L2_BUF_TYPE_VBI_CAPTURE: | ||
904 | if (vfd->vidioc_g_fmt_vbi) | ||
905 | ret=vfd->vidioc_g_fmt_vbi(file, fh, f); | ||
906 | break; | ||
907 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | ||
908 | if (vfd->vidioc_g_fmt_sliced_vbi_output) | ||
909 | ret = vfd->vidioc_g_fmt_sliced_vbi_output(file, fh, f); | ||
910 | break; | ||
911 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | ||
912 | if (vfd->vidioc_g_fmt_vbi_capture) | ||
913 | ret=vfd->vidioc_g_fmt_vbi_capture(file, fh, f); | ||
914 | break; | 894 | break; |
915 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | 895 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: |
916 | if (vfd->vidioc_g_fmt_video_output) | 896 | if (vfd->vidioc_g_fmt_vid_out) |
917 | ret=vfd->vidioc_g_fmt_video_output(file, | 897 | ret = vfd->vidioc_g_fmt_vid_out(file, fh, f); |
918 | fh, f); | ||
919 | break; | 898 | break; |
920 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 899 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: |
921 | if (vfd->vidioc_g_fmt_output_overlay) | 900 | if (vfd->vidioc_g_fmt_vid_out_overlay) |
922 | ret=vfd->vidioc_g_fmt_output_overlay(file, fh, f); | 901 | ret = vfd->vidioc_g_fmt_vid_out_overlay(file, |
902 | fh, f); | ||
903 | break; | ||
904 | case V4L2_BUF_TYPE_VBI_CAPTURE: | ||
905 | if (vfd->vidioc_g_fmt_vbi_cap) | ||
906 | ret = vfd->vidioc_g_fmt_vbi_cap(file, fh, f); | ||
923 | break; | 907 | break; |
924 | case V4L2_BUF_TYPE_VBI_OUTPUT: | 908 | case V4L2_BUF_TYPE_VBI_OUTPUT: |
925 | if (vfd->vidioc_g_fmt_vbi_output) | 909 | if (vfd->vidioc_g_fmt_vbi_out) |
926 | ret=vfd->vidioc_g_fmt_vbi_output(file, fh, f); | 910 | ret = vfd->vidioc_g_fmt_vbi_out(file, fh, f); |
911 | break; | ||
912 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | ||
913 | if (vfd->vidioc_g_fmt_sliced_vbi_cap) | ||
914 | ret = vfd->vidioc_g_fmt_sliced_vbi_cap(file, | ||
915 | fh, f); | ||
916 | break; | ||
917 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | ||
918 | if (vfd->vidioc_g_fmt_sliced_vbi_out) | ||
919 | ret = vfd->vidioc_g_fmt_sliced_vbi_out(file, | ||
920 | fh, f); | ||
927 | break; | 921 | break; |
928 | case V4L2_BUF_TYPE_PRIVATE: | 922 | case V4L2_BUF_TYPE_PRIVATE: |
929 | if (vfd->vidioc_g_fmt_type_private) | 923 | if (vfd->vidioc_g_fmt_type_private) |
930 | ret=vfd->vidioc_g_fmt_type_private(file, | 924 | ret = vfd->vidioc_g_fmt_type_private(file, |
931 | fh, f); | 925 | fh, f); |
932 | break; | 926 | break; |
933 | } | 927 | } |
@@ -945,42 +939,44 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, | |||
945 | switch (f->type) { | 939 | switch (f->type) { |
946 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 940 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
947 | v4l_print_pix_fmt(vfd,&f->fmt.pix); | 941 | v4l_print_pix_fmt(vfd,&f->fmt.pix); |
948 | if (vfd->vidioc_s_fmt_cap) | 942 | if (vfd->vidioc_s_fmt_vid_cap) |
949 | ret=vfd->vidioc_s_fmt_cap(file, fh, f); | 943 | ret = vfd->vidioc_s_fmt_vid_cap(file, fh, f); |
950 | break; | 944 | break; |
951 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 945 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
952 | if (vfd->vidioc_s_fmt_overlay) | 946 | if (vfd->vidioc_s_fmt_vid_overlay) |
953 | ret=vfd->vidioc_s_fmt_overlay(file, fh, f); | 947 | ret = vfd->vidioc_s_fmt_vid_overlay(file, |
954 | break; | 948 | fh, f); |
955 | case V4L2_BUF_TYPE_VBI_CAPTURE: | ||
956 | if (vfd->vidioc_s_fmt_vbi) | ||
957 | ret=vfd->vidioc_s_fmt_vbi(file, fh, f); | ||
958 | break; | ||
959 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | ||
960 | if (vfd->vidioc_s_fmt_sliced_vbi_output) | ||
961 | ret = vfd->vidioc_s_fmt_sliced_vbi_output(file, fh, f); | ||
962 | break; | ||
963 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | ||
964 | if (vfd->vidioc_s_fmt_vbi_capture) | ||
965 | ret=vfd->vidioc_s_fmt_vbi_capture(file, fh, f); | ||
966 | break; | 949 | break; |
967 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | 950 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: |
968 | if (vfd->vidioc_s_fmt_video_output) | 951 | if (vfd->vidioc_s_fmt_vid_out) |
969 | ret=vfd->vidioc_s_fmt_video_output(file, | 952 | ret = vfd->vidioc_s_fmt_vid_out(file, fh, f); |
970 | fh, f); | ||
971 | break; | 953 | break; |
972 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 954 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: |
973 | if (vfd->vidioc_s_fmt_output_overlay) | 955 | if (vfd->vidioc_s_fmt_vid_out_overlay) |
974 | ret=vfd->vidioc_s_fmt_output_overlay(file, fh, f); | 956 | ret = vfd->vidioc_s_fmt_vid_out_overlay(file, |
957 | fh, f); | ||
958 | break; | ||
959 | case V4L2_BUF_TYPE_VBI_CAPTURE: | ||
960 | if (vfd->vidioc_s_fmt_vbi_cap) | ||
961 | ret = vfd->vidioc_s_fmt_vbi_cap(file, fh, f); | ||
975 | break; | 962 | break; |
976 | case V4L2_BUF_TYPE_VBI_OUTPUT: | 963 | case V4L2_BUF_TYPE_VBI_OUTPUT: |
977 | if (vfd->vidioc_s_fmt_vbi_output) | 964 | if (vfd->vidioc_s_fmt_vbi_out) |
978 | ret=vfd->vidioc_s_fmt_vbi_output(file, | 965 | ret = vfd->vidioc_s_fmt_vbi_out(file, fh, f); |
979 | fh, f); | 966 | break; |
967 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | ||
968 | if (vfd->vidioc_s_fmt_sliced_vbi_cap) | ||
969 | ret = vfd->vidioc_s_fmt_sliced_vbi_cap(file, | ||
970 | fh, f); | ||
971 | break; | ||
972 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | ||
973 | if (vfd->vidioc_s_fmt_sliced_vbi_out) | ||
974 | ret = vfd->vidioc_s_fmt_sliced_vbi_out(file, | ||
975 | fh, f); | ||
980 | break; | 976 | break; |
981 | case V4L2_BUF_TYPE_PRIVATE: | 977 | case V4L2_BUF_TYPE_PRIVATE: |
982 | if (vfd->vidioc_s_fmt_type_private) | 978 | if (vfd->vidioc_s_fmt_type_private) |
983 | ret=vfd->vidioc_s_fmt_type_private(file, | 979 | ret = vfd->vidioc_s_fmt_type_private(file, |
984 | fh, f); | 980 | fh, f); |
985 | break; | 981 | break; |
986 | } | 982 | } |
@@ -995,46 +991,46 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, | |||
995 | v4l2_type_names)); | 991 | v4l2_type_names)); |
996 | switch (f->type) { | 992 | switch (f->type) { |
997 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 993 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
998 | if (vfd->vidioc_try_fmt_cap) | 994 | if (vfd->vidioc_try_fmt_vid_cap) |
999 | ret=vfd->vidioc_try_fmt_cap(file, fh, f); | 995 | ret = vfd->vidioc_try_fmt_vid_cap(file, fh, f); |
1000 | if (!ret) | 996 | if (!ret) |
1001 | v4l_print_pix_fmt(vfd,&f->fmt.pix); | 997 | v4l_print_pix_fmt(vfd,&f->fmt.pix); |
1002 | break; | 998 | break; |
1003 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 999 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
1004 | if (vfd->vidioc_try_fmt_overlay) | 1000 | if (vfd->vidioc_try_fmt_vid_overlay) |
1005 | ret=vfd->vidioc_try_fmt_overlay(file, fh, f); | 1001 | ret = vfd->vidioc_try_fmt_vid_overlay(file, |
1002 | fh, f); | ||
1003 | break; | ||
1004 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | ||
1005 | if (vfd->vidioc_try_fmt_vid_out) | ||
1006 | ret = vfd->vidioc_try_fmt_vid_out(file, fh, f); | ||
1007 | break; | ||
1008 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | ||
1009 | if (vfd->vidioc_try_fmt_vid_out_overlay) | ||
1010 | ret = vfd->vidioc_try_fmt_vid_out_overlay(file, | ||
1011 | fh, f); | ||
1006 | break; | 1012 | break; |
1007 | case V4L2_BUF_TYPE_VBI_CAPTURE: | 1013 | case V4L2_BUF_TYPE_VBI_CAPTURE: |
1008 | if (vfd->vidioc_try_fmt_vbi) | 1014 | if (vfd->vidioc_try_fmt_vbi_cap) |
1009 | ret=vfd->vidioc_try_fmt_vbi(file, fh, f); | 1015 | ret = vfd->vidioc_try_fmt_vbi_cap(file, fh, f); |
1010 | break; | 1016 | break; |
1011 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | 1017 | case V4L2_BUF_TYPE_VBI_OUTPUT: |
1012 | if (vfd->vidioc_try_fmt_sliced_vbi_output) | 1018 | if (vfd->vidioc_try_fmt_vbi_out) |
1013 | ret = vfd->vidioc_try_fmt_sliced_vbi_output(file, | 1019 | ret = vfd->vidioc_try_fmt_vbi_out(file, fh, f); |
1014 | fh, f); | ||
1015 | break; | 1020 | break; |
1016 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | 1021 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: |
1017 | if (vfd->vidioc_try_fmt_vbi_capture) | 1022 | if (vfd->vidioc_try_fmt_sliced_vbi_cap) |
1018 | ret=vfd->vidioc_try_fmt_vbi_capture(file, | 1023 | ret = vfd->vidioc_try_fmt_sliced_vbi_cap(file, |
1019 | fh, f); | ||
1020 | break; | ||
1021 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | ||
1022 | if (vfd->vidioc_try_fmt_video_output) | ||
1023 | ret=vfd->vidioc_try_fmt_video_output(file, | ||
1024 | fh, f); | 1024 | fh, f); |
1025 | break; | 1025 | break; |
1026 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 1026 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: |
1027 | if (vfd->vidioc_try_fmt_output_overlay) | 1027 | if (vfd->vidioc_try_fmt_sliced_vbi_out) |
1028 | ret=vfd->vidioc_try_fmt_output_overlay(file, fh, f); | 1028 | ret = vfd->vidioc_try_fmt_sliced_vbi_out(file, |
1029 | break; | ||
1030 | case V4L2_BUF_TYPE_VBI_OUTPUT: | ||
1031 | if (vfd->vidioc_try_fmt_vbi_output) | ||
1032 | ret=vfd->vidioc_try_fmt_vbi_output(file, | ||
1033 | fh, f); | 1029 | fh, f); |
1034 | break; | 1030 | break; |
1035 | case V4L2_BUF_TYPE_PRIVATE: | 1031 | case V4L2_BUF_TYPE_PRIVATE: |
1036 | if (vfd->vidioc_try_fmt_type_private) | 1032 | if (vfd->vidioc_try_fmt_type_private) |
1037 | ret=vfd->vidioc_try_fmt_type_private(file, | 1033 | ret = vfd->vidioc_try_fmt_type_private(file, |
1038 | fh, f); | 1034 | fh, f); |
1039 | break; | 1035 | break; |
1040 | } | 1036 | } |
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 5ff9a58b613..a9747a10c54 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, | |||
630 | return 0; | 630 | return 0; |
631 | } | 631 | } |
632 | 632 | ||
633 | static int vidioc_enum_fmt_cap(struct file *file, void *priv, | 633 | static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, |
634 | struct v4l2_fmtdesc *f) | 634 | struct v4l2_fmtdesc *f) |
635 | { | 635 | { |
636 | if (f->index > 0) | 636 | if (f->index > 0) |
@@ -641,7 +641,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *priv, | |||
641 | return 0; | 641 | return 0; |
642 | } | 642 | } |
643 | 643 | ||
644 | static int vidioc_g_fmt_cap(struct file *file, void *priv, | 644 | static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, |
645 | struct v4l2_format *f) | 645 | struct v4l2_format *f) |
646 | { | 646 | { |
647 | struct vivi_fh *fh = priv; | 647 | struct vivi_fh *fh = priv; |
@@ -658,7 +658,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv, | |||
658 | return (0); | 658 | return (0); |
659 | } | 659 | } |
660 | 660 | ||
661 | static int vidioc_try_fmt_cap(struct file *file, void *priv, | 661 | static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, |
662 | struct v4l2_format *f) | 662 | struct v4l2_format *f) |
663 | { | 663 | { |
664 | struct vivi_fh *fh = priv; | 664 | struct vivi_fh *fh = priv; |
@@ -706,13 +706,13 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv, | |||
706 | } | 706 | } |
707 | 707 | ||
708 | /*FIXME: This seems to be generic enough to be at videodev2 */ | 708 | /*FIXME: This seems to be generic enough to be at videodev2 */ |
709 | static int vidioc_s_fmt_cap(struct file *file, void *priv, | 709 | static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, |
710 | struct v4l2_format *f) | 710 | struct v4l2_format *f) |
711 | { | 711 | { |
712 | struct vivi_fh *fh = priv; | 712 | struct vivi_fh *fh = priv; |
713 | struct videobuf_queue *q = &fh->vb_vidq; | 713 | struct videobuf_queue *q = &fh->vb_vidq; |
714 | 714 | ||
715 | int ret = vidioc_try_fmt_cap(file, fh, f); | 715 | int ret = vidioc_try_fmt_vid_cap(file, fh, f); |
716 | if (ret < 0) | 716 | if (ret < 0) |
717 | return (ret); | 717 | return (ret); |
718 | 718 | ||
@@ -1066,10 +1066,10 @@ static struct video_device vivi_template = { | |||
1066 | .release = video_device_release, | 1066 | .release = video_device_release, |
1067 | 1067 | ||
1068 | .vidioc_querycap = vidioc_querycap, | 1068 | .vidioc_querycap = vidioc_querycap, |
1069 | .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, | 1069 | .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, |
1070 | .vidioc_g_fmt_cap = vidioc_g_fmt_cap, | 1070 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, |
1071 | .vidioc_try_fmt_cap = vidioc_try_fmt_cap, | 1071 | .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, |
1072 | .vidioc_s_fmt_cap = vidioc_s_fmt_cap, | 1072 | .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, |
1073 | .vidioc_reqbufs = vidioc_reqbufs, | 1073 | .vidioc_reqbufs = vidioc_reqbufs, |
1074 | .vidioc_querybuf = vidioc_querybuf, | 1074 | .vidioc_querybuf = vidioc_querybuf, |
1075 | .vidioc_qbuf = vidioc_qbuf, | 1075 | .vidioc_qbuf = vidioc_qbuf, |
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c index a0e49dc6630..485df2e3613 100644 --- a/drivers/media/video/zr364xx.c +++ b/drivers/media/video/zr364xx.c | |||
@@ -521,7 +521,7 @@ static int zr364xx_vidioc_g_ctrl(struct file *file, void *priv, | |||
521 | return 0; | 521 | return 0; |
522 | } | 522 | } |
523 | 523 | ||
524 | static int zr364xx_vidioc_enum_fmt_cap(struct file *file, | 524 | static int zr364xx_vidioc_enum_fmt_vid_cap(struct file *file, |
525 | void *priv, struct v4l2_fmtdesc *f) | 525 | void *priv, struct v4l2_fmtdesc *f) |
526 | { | 526 | { |
527 | if (f->index > 0) | 527 | if (f->index > 0) |
@@ -537,7 +537,7 @@ static int zr364xx_vidioc_enum_fmt_cap(struct file *file, | |||
537 | return 0; | 537 | return 0; |
538 | } | 538 | } |
539 | 539 | ||
540 | static int zr364xx_vidioc_try_fmt_cap(struct file *file, void *priv, | 540 | static int zr364xx_vidioc_try_fmt_vid_cap(struct file *file, void *priv, |
541 | struct v4l2_format *f) | 541 | struct v4l2_format *f) |
542 | { | 542 | { |
543 | struct video_device *vdev = video_devdata(file); | 543 | struct video_device *vdev = video_devdata(file); |
@@ -564,7 +564,7 @@ static int zr364xx_vidioc_try_fmt_cap(struct file *file, void *priv, | |||
564 | return 0; | 564 | return 0; |
565 | } | 565 | } |
566 | 566 | ||
567 | static int zr364xx_vidioc_g_fmt_cap(struct file *file, void *priv, | 567 | static int zr364xx_vidioc_g_fmt_vid_cap(struct file *file, void *priv, |
568 | struct v4l2_format *f) | 568 | struct v4l2_format *f) |
569 | { | 569 | { |
570 | struct video_device *vdev = video_devdata(file); | 570 | struct video_device *vdev = video_devdata(file); |
@@ -589,7 +589,7 @@ static int zr364xx_vidioc_g_fmt_cap(struct file *file, void *priv, | |||
589 | return 0; | 589 | return 0; |
590 | } | 590 | } |
591 | 591 | ||
592 | static int zr364xx_vidioc_s_fmt_cap(struct file *file, void *priv, | 592 | static int zr364xx_vidioc_s_fmt_vid_cap(struct file *file, void *priv, |
593 | struct v4l2_format *f) | 593 | struct v4l2_format *f) |
594 | { | 594 | { |
595 | struct video_device *vdev = video_devdata(file); | 595 | struct video_device *vdev = video_devdata(file); |
@@ -770,10 +770,10 @@ static struct video_device zr364xx_template = { | |||
770 | .minor = -1, | 770 | .minor = -1, |
771 | 771 | ||
772 | .vidioc_querycap = zr364xx_vidioc_querycap, | 772 | .vidioc_querycap = zr364xx_vidioc_querycap, |
773 | .vidioc_enum_fmt_cap = zr364xx_vidioc_enum_fmt_cap, | 773 | .vidioc_enum_fmt_vid_cap = zr364xx_vidioc_enum_fmt_vid_cap, |
774 | .vidioc_try_fmt_cap = zr364xx_vidioc_try_fmt_cap, | 774 | .vidioc_try_fmt_vid_cap = zr364xx_vidioc_try_fmt_vid_cap, |
775 | .vidioc_s_fmt_cap = zr364xx_vidioc_s_fmt_cap, | 775 | .vidioc_s_fmt_vid_cap = zr364xx_vidioc_s_fmt_vid_cap, |
776 | .vidioc_g_fmt_cap = zr364xx_vidioc_g_fmt_cap, | 776 | .vidioc_g_fmt_vid_cap = zr364xx_vidioc_g_fmt_vid_cap, |
777 | .vidioc_enum_input = zr364xx_vidioc_enum_input, | 777 | .vidioc_enum_input = zr364xx_vidioc_enum_input, |
778 | .vidioc_g_input = zr364xx_vidioc_g_input, | 778 | .vidioc_g_input = zr364xx_vidioc_g_input, |
779 | .vidioc_s_input = zr364xx_vidioc_s_input, | 779 | .vidioc_s_input = zr364xx_vidioc_s_input, |
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index f14181fae6c..40b0810a595 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
@@ -118,82 +118,76 @@ struct video_device | |||
118 | enum v4l2_priority p); | 118 | enum v4l2_priority p); |
119 | 119 | ||
120 | /* VIDIOC_ENUM_FMT handlers */ | 120 | /* VIDIOC_ENUM_FMT handlers */ |
121 | int (*vidioc_enum_fmt_cap) (struct file *file, void *fh, | 121 | int (*vidioc_enum_fmt_vid_cap) (struct file *file, void *fh, |
122 | struct v4l2_fmtdesc *f); | 122 | struct v4l2_fmtdesc *f); |
123 | int (*vidioc_enum_fmt_overlay) (struct file *file, void *fh, | 123 | int (*vidioc_enum_fmt_vid_overlay) (struct file *file, void *fh, |
124 | struct v4l2_fmtdesc *f); | 124 | struct v4l2_fmtdesc *f); |
125 | int (*vidioc_enum_fmt_vbi) (struct file *file, void *fh, | 125 | int (*vidioc_enum_fmt_vid_out) (struct file *file, void *fh, |
126 | struct v4l2_fmtdesc *f); | 126 | struct v4l2_fmtdesc *f); |
127 | int (*vidioc_enum_fmt_vbi_capture) (struct file *file, void *fh, | 127 | #if 1 |
128 | struct v4l2_fmtdesc *f); | 128 | /* deprecated, will be removed in 2.6.28 */ |
129 | int (*vidioc_enum_fmt_video_output)(struct file *file, void *fh, | 129 | int (*vidioc_enum_fmt_vbi_cap) (struct file *file, void *fh, |
130 | struct v4l2_fmtdesc *f); | ||
131 | int (*vidioc_enum_fmt_output_overlay) (struct file *file, void *fh, | ||
132 | struct v4l2_fmtdesc *f); | ||
133 | int (*vidioc_enum_fmt_vbi_output) (struct file *file, void *fh, | ||
134 | struct v4l2_fmtdesc *f); | ||
135 | int (*vidioc_enum_fmt_sliced_vbi_output) (struct file *file, void *fh, | ||
136 | struct v4l2_fmtdesc *f); | 130 | struct v4l2_fmtdesc *f); |
131 | #endif | ||
137 | int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh, | 132 | int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh, |
138 | struct v4l2_fmtdesc *f); | 133 | struct v4l2_fmtdesc *f); |
139 | 134 | ||
140 | /* VIDIOC_G_FMT handlers */ | 135 | /* VIDIOC_G_FMT handlers */ |
141 | int (*vidioc_g_fmt_cap) (struct file *file, void *fh, | 136 | int (*vidioc_g_fmt_vid_cap) (struct file *file, void *fh, |
142 | struct v4l2_format *f); | 137 | struct v4l2_format *f); |
143 | int (*vidioc_g_fmt_overlay) (struct file *file, void *fh, | 138 | int (*vidioc_g_fmt_vid_overlay)(struct file *file, void *fh, |
144 | struct v4l2_format *f); | 139 | struct v4l2_format *f); |
145 | int (*vidioc_g_fmt_vbi) (struct file *file, void *fh, | 140 | int (*vidioc_g_fmt_vid_out) (struct file *file, void *fh, |
146 | struct v4l2_format *f); | 141 | struct v4l2_format *f); |
147 | int (*vidioc_g_fmt_vbi_output) (struct file *file, void *fh, | 142 | int (*vidioc_g_fmt_vid_out_overlay)(struct file *file, void *fh, |
148 | struct v4l2_format *f); | 143 | struct v4l2_format *f); |
149 | int (*vidioc_g_fmt_sliced_vbi_output) (struct file *file, void *fh, | 144 | int (*vidioc_g_fmt_vbi_cap) (struct file *file, void *fh, |
150 | struct v4l2_format *f); | 145 | struct v4l2_format *f); |
151 | int (*vidioc_g_fmt_vbi_capture)(struct file *file, void *fh, | 146 | int (*vidioc_g_fmt_vbi_out) (struct file *file, void *fh, |
152 | struct v4l2_format *f); | 147 | struct v4l2_format *f); |
153 | int (*vidioc_g_fmt_video_output)(struct file *file, void *fh, | 148 | int (*vidioc_g_fmt_sliced_vbi_cap)(struct file *file, void *fh, |
154 | struct v4l2_format *f); | 149 | struct v4l2_format *f); |
155 | int (*vidioc_g_fmt_output_overlay) (struct file *file, void *fh, | 150 | int (*vidioc_g_fmt_sliced_vbi_out)(struct file *file, void *fh, |
156 | struct v4l2_format *f); | 151 | struct v4l2_format *f); |
157 | int (*vidioc_g_fmt_type_private)(struct file *file, void *fh, | 152 | int (*vidioc_g_fmt_type_private)(struct file *file, void *fh, |
158 | struct v4l2_format *f); | 153 | struct v4l2_format *f); |
159 | 154 | ||
160 | /* VIDIOC_S_FMT handlers */ | 155 | /* VIDIOC_S_FMT handlers */ |
161 | int (*vidioc_s_fmt_cap) (struct file *file, void *fh, | 156 | int (*vidioc_s_fmt_vid_cap) (struct file *file, void *fh, |
162 | struct v4l2_format *f); | 157 | struct v4l2_format *f); |
163 | 158 | int (*vidioc_s_fmt_vid_overlay)(struct file *file, void *fh, | |
164 | int (*vidioc_s_fmt_overlay) (struct file *file, void *fh, | ||
165 | struct v4l2_format *f); | 159 | struct v4l2_format *f); |
166 | int (*vidioc_s_fmt_vbi) (struct file *file, void *fh, | 160 | int (*vidioc_s_fmt_vid_out) (struct file *file, void *fh, |
167 | struct v4l2_format *f); | 161 | struct v4l2_format *f); |
168 | int (*vidioc_s_fmt_vbi_output) (struct file *file, void *fh, | 162 | int (*vidioc_s_fmt_vid_out_overlay)(struct file *file, void *fh, |
169 | struct v4l2_format *f); | 163 | struct v4l2_format *f); |
170 | int (*vidioc_s_fmt_sliced_vbi_output) (struct file *file, void *fh, | 164 | int (*vidioc_s_fmt_vbi_cap) (struct file *file, void *fh, |
171 | struct v4l2_format *f); | 165 | struct v4l2_format *f); |
172 | int (*vidioc_s_fmt_vbi_capture)(struct file *file, void *fh, | 166 | int (*vidioc_s_fmt_vbi_out) (struct file *file, void *fh, |
173 | struct v4l2_format *f); | 167 | struct v4l2_format *f); |
174 | int (*vidioc_s_fmt_video_output)(struct file *file, void *fh, | 168 | int (*vidioc_s_fmt_sliced_vbi_cap)(struct file *file, void *fh, |
175 | struct v4l2_format *f); | 169 | struct v4l2_format *f); |
176 | int (*vidioc_s_fmt_output_overlay) (struct file *file, void *fh, | 170 | int (*vidioc_s_fmt_sliced_vbi_out)(struct file *file, void *fh, |
177 | struct v4l2_format *f); | 171 | struct v4l2_format *f); |
178 | int (*vidioc_s_fmt_type_private)(struct file *file, void *fh, | 172 | int (*vidioc_s_fmt_type_private)(struct file *file, void *fh, |
179 | struct v4l2_format *f); | 173 | struct v4l2_format *f); |
180 | 174 | ||
181 | /* VIDIOC_TRY_FMT handlers */ | 175 | /* VIDIOC_TRY_FMT handlers */ |
182 | int (*vidioc_try_fmt_cap) (struct file *file, void *fh, | 176 | int (*vidioc_try_fmt_vid_cap) (struct file *file, void *fh, |
183 | struct v4l2_format *f); | 177 | struct v4l2_format *f); |
184 | int (*vidioc_try_fmt_overlay) (struct file *file, void *fh, | 178 | int (*vidioc_try_fmt_vid_overlay)(struct file *file, void *fh, |
185 | struct v4l2_format *f); | 179 | struct v4l2_format *f); |
186 | int (*vidioc_try_fmt_vbi) (struct file *file, void *fh, | 180 | int (*vidioc_try_fmt_vid_out) (struct file *file, void *fh, |
187 | struct v4l2_format *f); | 181 | struct v4l2_format *f); |
188 | int (*vidioc_try_fmt_vbi_output) (struct file *file, void *fh, | 182 | int (*vidioc_try_fmt_vid_out_overlay)(struct file *file, void *fh, |
189 | struct v4l2_format *f); | 183 | struct v4l2_format *f); |
190 | int (*vidioc_try_fmt_sliced_vbi_output) (struct file *file, void *fh, | 184 | int (*vidioc_try_fmt_vbi_cap) (struct file *file, void *fh, |
191 | struct v4l2_format *f); | 185 | struct v4l2_format *f); |
192 | int (*vidioc_try_fmt_vbi_capture)(struct file *file, void *fh, | 186 | int (*vidioc_try_fmt_vbi_out) (struct file *file, void *fh, |
193 | struct v4l2_format *f); | 187 | struct v4l2_format *f); |
194 | int (*vidioc_try_fmt_video_output)(struct file *file, void *fh, | 188 | int (*vidioc_try_fmt_sliced_vbi_cap)(struct file *file, void *fh, |
195 | struct v4l2_format *f); | 189 | struct v4l2_format *f); |
196 | int (*vidioc_try_fmt_output_overlay)(struct file *file, void *fh, | 190 | int (*vidioc_try_fmt_sliced_vbi_out)(struct file *file, void *fh, |
197 | struct v4l2_format *f); | 191 | struct v4l2_format *f); |
198 | int (*vidioc_try_fmt_type_private)(struct file *file, void *fh, | 192 | int (*vidioc_try_fmt_type_private)(struct file *file, void *fh, |
199 | struct v4l2_format *f); | 193 | struct v4l2_format *f); |