aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-27 20:22:59 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:04:21 -0500
commite5ae3db461f2de1f4fb455bc73c059c0b97b1230 (patch)
tree69ef2bc3413d1dd18d8bb1453b7597416e1e29a4 /drivers
parent402aa76aa5e57801b4db5ccf8c7beea9f580bb1b (diff)
V4L/DVB (6912): Replace vidioc_ to bttv_
Since there are a few vidioc_ functions that were exported, rename those functions to bttv_ in order to avoid poluting namespace. The other functions were also renamed, to standardize inside the driver. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c186
-rw-r--r--drivers/media/video/bt8xx/bttv-vbi.c6
-rw-r--r--drivers/media/video/bt8xx/bttvp.h6
3 files changed, 99 insertions, 99 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index d6a305ddc53e..30cc2d3ba52d 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1680,7 +1680,7 @@ static struct videobuf_queue_ops bttv_video_qops = {
1680 .buf_release = buffer_release, 1680 .buf_release = buffer_release,
1681}; 1681};
1682 1682
1683static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id) 1683static int bttv_s_std(struct file *file, void *priv, v4l2_std_id *id)
1684{ 1684{
1685 struct bttv_fh *fh = priv; 1685 struct bttv_fh *fh = priv;
1686 struct bttv *btv = fh->btv; 1686 struct bttv *btv = fh->btv;
@@ -1704,7 +1704,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id)
1704 return 0; 1704 return 0;
1705} 1705}
1706 1706
1707static int vidioc_querystd(struct file *file, void *f, v4l2_std_id *id) 1707static int bttv_querystd(struct file *file, void *f, v4l2_std_id *id)
1708{ 1708{
1709 struct bttv_fh *fh = f; 1709 struct bttv_fh *fh = f;
1710 struct bttv *btv = fh->btv; 1710 struct bttv *btv = fh->btv;
@@ -1716,7 +1716,7 @@ static int vidioc_querystd(struct file *file, void *f, v4l2_std_id *id)
1716 return 0; 1716 return 0;
1717} 1717}
1718 1718
1719static int vidioc_enum_input(struct file *file, void *priv, 1719static int bttv_enum_input(struct file *file, void *priv,
1720 struct v4l2_input *i) 1720 struct v4l2_input *i)
1721{ 1721{
1722 struct bttv_fh *fh = priv; 1722 struct bttv_fh *fh = priv;
@@ -1758,7 +1758,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
1758 return 0; 1758 return 0;
1759} 1759}
1760 1760
1761static int vidioc_g_input(struct file *file, void *priv, unsigned int *i) 1761static int bttv_g_input(struct file *file, void *priv, unsigned int *i)
1762{ 1762{
1763 struct bttv_fh *fh = priv; 1763 struct bttv_fh *fh = priv;
1764 struct bttv *btv = fh->btv; 1764 struct bttv *btv = fh->btv;
@@ -1767,7 +1767,7 @@ static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
1767 return 0; 1767 return 0;
1768} 1768}
1769 1769
1770static int vidioc_s_input(struct file *file, void *priv, unsigned int i) 1770static int bttv_s_input(struct file *file, void *priv, unsigned int i)
1771{ 1771{
1772 struct bttv_fh *fh = priv; 1772 struct bttv_fh *fh = priv;
1773 struct bttv *btv = fh->btv; 1773 struct bttv *btv = fh->btv;
@@ -1787,7 +1787,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
1787 return 0; 1787 return 0;
1788} 1788}
1789 1789
1790static int vidioc_s_tuner(struct file *file, void *priv, 1790static int bttv_s_tuner(struct file *file, void *priv,
1791 struct v4l2_tuner *t) 1791 struct v4l2_tuner *t)
1792{ 1792{
1793 struct bttv_fh *fh = priv; 1793 struct bttv_fh *fh = priv;
@@ -1815,7 +1815,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
1815 return 0; 1815 return 0;
1816} 1816}
1817 1817
1818static int vidioc_g_frequency(struct file *file, void *priv, 1818static int bttv_g_frequency(struct file *file, void *priv,
1819 struct v4l2_frequency *f) 1819 struct v4l2_frequency *f)
1820{ 1820{
1821 struct bttv_fh *fh = priv; 1821 struct bttv_fh *fh = priv;
@@ -1832,7 +1832,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
1832 return 0; 1832 return 0;
1833} 1833}
1834 1834
1835static int vidioc_s_frequency(struct file *file, void *priv, 1835static int bttv_s_frequency(struct file *file, void *priv,
1836 struct v4l2_frequency *f) 1836 struct v4l2_frequency *f)
1837{ 1837{
1838 struct bttv_fh *fh = priv; 1838 struct bttv_fh *fh = priv;
@@ -1856,7 +1856,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
1856 return 0; 1856 return 0;
1857} 1857}
1858 1858
1859static int vidioc_log_status(struct file *file, void *f) 1859static int bttv_log_status(struct file *file, void *f)
1860{ 1860{
1861 struct bttv_fh *fh = f; 1861 struct bttv_fh *fh = f;
1862 struct bttv *btv = fh->btv; 1862 struct bttv *btv = fh->btv;
@@ -1869,7 +1869,7 @@ static int vidioc_log_status(struct file *file, void *f)
1869 return 0; 1869 return 0;
1870} 1870}
1871 1871
1872static int vidioc_g_ctrl(struct file *file, void *priv, 1872static int bttv_g_ctrl(struct file *file, void *priv,
1873 struct v4l2_control *c) 1873 struct v4l2_control *c)
1874{ 1874{
1875 struct bttv_fh *fh = priv; 1875 struct bttv_fh *fh = priv;
@@ -1936,7 +1936,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
1936 return 0; 1936 return 0;
1937} 1937}
1938 1938
1939static int vidioc_s_ctrl(struct file *file, void *f, 1939static int bttv_s_ctrl(struct file *file, void *f,
1940 struct v4l2_control *c) 1940 struct v4l2_control *c)
1941{ 1941{
1942 int err; 1942 int err;
@@ -2034,7 +2034,7 @@ static int vidioc_s_ctrl(struct file *file, void *f,
2034} 2034}
2035 2035
2036#ifdef CONFIG_VIDEO_ADV_DEBUG 2036#ifdef CONFIG_VIDEO_ADV_DEBUG
2037static int vidioc_g_register(struct file *file, void *f, 2037static int bttv_g_register(struct file *file, void *f,
2038 struct v4l2_register *reg) 2038 struct v4l2_register *reg)
2039{ 2039{
2040 struct bttv_fh *fh = f; 2040 struct bttv_fh *fh = f;
@@ -2053,7 +2053,7 @@ static int vidioc_g_register(struct file *file, void *f,
2053 return 0; 2053 return 0;
2054} 2054}
2055 2055
2056static int vidioc_s_register(struct file *file, void *f, 2056static int bttv_s_register(struct file *file, void *f,
2057 struct v4l2_register *reg) 2057 struct v4l2_register *reg)
2058{ 2058{
2059 struct bttv_fh *fh = f; 2059 struct bttv_fh *fh = f;
@@ -2447,7 +2447,7 @@ pix_format_set_size (struct v4l2_pix_format * f,
2447 } 2447 }
2448} 2448}
2449 2449
2450static int vidioc_g_fmt_cap(struct file *file, void *priv, 2450static int bttv_g_fmt_cap(struct file *file, void *priv,
2451 struct v4l2_format *f) 2451 struct v4l2_format *f)
2452{ 2452{
2453 struct bttv_fh *fh = priv; 2453 struct bttv_fh *fh = priv;
@@ -2460,7 +2460,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv,
2460 return 0; 2460 return 0;
2461} 2461}
2462 2462
2463static int vidioc_g_fmt_overlay(struct file *file, void *priv, 2463static int bttv_g_fmt_overlay(struct file *file, void *priv,
2464 struct v4l2_format *f) 2464 struct v4l2_format *f)
2465{ 2465{
2466 struct bttv_fh *fh = priv; 2466 struct bttv_fh *fh = priv;
@@ -2471,7 +2471,7 @@ static int vidioc_g_fmt_overlay(struct file *file, void *priv,
2471 return 0; 2471 return 0;
2472} 2472}
2473 2473
2474static int vidioc_try_fmt_cap(struct file *file, void *priv, 2474static int bttv_try_fmt_cap(struct file *file, void *priv,
2475 struct v4l2_format *f) 2475 struct v4l2_format *f)
2476{ 2476{
2477 const struct bttv_format *fmt; 2477 const struct bttv_format *fmt;
@@ -2522,7 +2522,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv,
2522 return 0; 2522 return 0;
2523} 2523}
2524 2524
2525static int vidioc_try_fmt_overlay(struct file *file, void *priv, 2525static int bttv_try_fmt_overlay(struct file *file, void *priv,
2526 struct v4l2_format *f) 2526 struct v4l2_format *f)
2527{ 2527{
2528 struct bttv_fh *fh = priv; 2528 struct bttv_fh *fh = priv;
@@ -2532,7 +2532,7 @@ static int vidioc_try_fmt_overlay(struct file *file, void *priv,
2532 /* adjust_crop */ 0); 2532 /* adjust_crop */ 0);
2533} 2533}
2534 2534
2535static int vidioc_s_fmt_cap(struct file *file, void *priv, 2535static int bttv_s_fmt_cap(struct file *file, void *priv,
2536 struct v4l2_format *f) 2536 struct v4l2_format *f)
2537{ 2537{
2538 int retval; 2538 int retval;
@@ -2544,7 +2544,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
2544 if (0 != retval) 2544 if (0 != retval)
2545 return retval; 2545 return retval;
2546 2546
2547 retval = vidioc_try_fmt_cap(file, priv, f); 2547 retval = bttv_try_fmt_cap(file, priv, f);
2548 if (0 != retval) 2548 if (0 != retval)
2549 return retval; 2549 return retval;
2550 2550
@@ -2565,7 +2565,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
2565 return 0; 2565 return 0;
2566} 2566}
2567 2567
2568static int vidioc_s_fmt_overlay(struct file *file, void *priv, 2568static int bttv_s_fmt_overlay(struct file *file, void *priv,
2569 struct v4l2_format *f) 2569 struct v4l2_format *f)
2570{ 2570{
2571 struct bttv_fh *fh = priv; 2571 struct bttv_fh *fh = priv;
@@ -2605,7 +2605,7 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
2605} 2605}
2606#endif 2606#endif
2607 2607
2608static int vidioc_querycap(struct file *file, void *priv, 2608static int bttv_querycap(struct file *file, void *priv,
2609 struct v4l2_capability *cap) 2609 struct v4l2_capability *cap)
2610{ 2610{
2611 struct bttv_fh *fh = priv; 2611 struct bttv_fh *fh = priv;
@@ -2633,7 +2633,7 @@ static int vidioc_querycap(struct file *file, void *priv,
2633 return 0; 2633 return 0;
2634} 2634}
2635 2635
2636static int vidioc_enum_fmt_cap(struct file *file, void *priv, 2636static int bttv_enum_fmt_cap(struct file *file, void *priv,
2637 struct v4l2_fmtdesc *f) 2637 struct v4l2_fmtdesc *f)
2638{ 2638{
2639 if (f->index >= FORMATS) 2639 if (f->index >= FORMATS)
@@ -2645,7 +2645,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *priv,
2645 return 0; 2645 return 0;
2646} 2646}
2647 2647
2648static int vidioc_enum_fmt_overlay(struct file *file, void *priv, 2648static int bttv_enum_fmt_overlay(struct file *file, void *priv,
2649 struct v4l2_fmtdesc *f) 2649 struct v4l2_fmtdesc *f)
2650{ 2650{
2651 if (no_overlay > 0) { 2651 if (no_overlay > 0) {
@@ -2664,7 +2664,7 @@ static int vidioc_enum_fmt_overlay(struct file *file, void *priv,
2664 return 0; 2664 return 0;
2665} 2665}
2666 2666
2667static int vidioc_enum_fmt_vbi(struct file *file, void *priv, 2667static int bttv_enum_fmt_vbi(struct file *file, void *priv,
2668 struct v4l2_fmtdesc *f) 2668 struct v4l2_fmtdesc *f)
2669{ 2669{
2670 if (0 != f->index) 2670 if (0 != f->index)
@@ -2676,7 +2676,7 @@ static int vidioc_enum_fmt_vbi(struct file *file, void *priv,
2676 return 0; 2676 return 0;
2677} 2677}
2678 2678
2679static int vidioc_g_fbuf(struct file *file, void *f, 2679static int bttv_g_fbuf(struct file *file, void *f,
2680 struct v4l2_framebuffer *fb) 2680 struct v4l2_framebuffer *fb)
2681{ 2681{
2682 struct bttv_fh *fh = f; 2682 struct bttv_fh *fh = f;
@@ -2689,7 +2689,7 @@ static int vidioc_g_fbuf(struct file *file, void *f,
2689 return 0; 2689 return 0;
2690} 2690}
2691 2691
2692static int vidioc_overlay(struct file *file, void *f, unsigned int on) 2692static int bttv_overlay(struct file *file, void *f, unsigned int on)
2693{ 2693{
2694 struct bttv_fh *fh = f; 2694 struct bttv_fh *fh = f;
2695 struct bttv *btv = fh->btv; 2695 struct bttv *btv = fh->btv;
@@ -2724,7 +2724,7 @@ static int vidioc_overlay(struct file *file, void *f, unsigned int on)
2724 return retval; 2724 return retval;
2725} 2725}
2726 2726
2727static int vidioc_s_fbuf(struct file *file, void *f, 2727static int bttv_s_fbuf(struct file *file, void *f,
2728 struct v4l2_framebuffer *fb) 2728 struct v4l2_framebuffer *fb)
2729{ 2729{
2730 struct bttv_fh *fh = f; 2730 struct bttv_fh *fh = f;
@@ -2795,21 +2795,21 @@ static int vidioc_s_fbuf(struct file *file, void *f,
2795 return retval; 2795 return retval;
2796} 2796}
2797 2797
2798static int vidioc_reqbufs(struct file *file, void *priv, 2798static int bttv_reqbufs(struct file *file, void *priv,
2799 struct v4l2_requestbuffers *p) 2799 struct v4l2_requestbuffers *p)
2800{ 2800{
2801 struct bttv_fh *fh = priv; 2801 struct bttv_fh *fh = priv;
2802 return videobuf_reqbufs(bttv_queue(fh), p); 2802 return videobuf_reqbufs(bttv_queue(fh), p);
2803} 2803}
2804 2804
2805static int vidioc_querybuf(struct file *file, void *priv, 2805static int bttv_querybuf(struct file *file, void *priv,
2806 struct v4l2_buffer *b) 2806 struct v4l2_buffer *b)
2807{ 2807{
2808 struct bttv_fh *fh = priv; 2808 struct bttv_fh *fh = priv;
2809 return videobuf_querybuf(bttv_queue(fh), b); 2809 return videobuf_querybuf(bttv_queue(fh), b);
2810} 2810}
2811 2811
2812static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *b) 2812static int bttv_qbuf(struct file *file, void *priv, struct v4l2_buffer *b)
2813{ 2813{
2814 struct bttv_fh *fh = priv; 2814 struct bttv_fh *fh = priv;
2815 struct bttv *btv = fh->btv; 2815 struct bttv *btv = fh->btv;
@@ -2821,14 +2821,14 @@ static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *b)
2821 return videobuf_qbuf(bttv_queue(fh), b); 2821 return videobuf_qbuf(bttv_queue(fh), b);
2822} 2822}
2823 2823
2824static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) 2824static int bttv_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b)
2825{ 2825{
2826 struct bttv_fh *fh = priv; 2826 struct bttv_fh *fh = priv;
2827 return videobuf_dqbuf(bttv_queue(fh), b, 2827 return videobuf_dqbuf(bttv_queue(fh), b,
2828 file->f_flags & O_NONBLOCK); 2828 file->f_flags & O_NONBLOCK);
2829} 2829}
2830 2830
2831static int vidioc_streamon(struct file *file, void *priv, 2831static int bttv_streamon(struct file *file, void *priv,
2832 enum v4l2_buf_type type) 2832 enum v4l2_buf_type type)
2833{ 2833{
2834 struct bttv_fh *fh = priv; 2834 struct bttv_fh *fh = priv;
@@ -2841,7 +2841,7 @@ static int vidioc_streamon(struct file *file, void *priv,
2841} 2841}
2842 2842
2843 2843
2844static int vidioc_streamoff(struct file *file, void *priv, 2844static int bttv_streamoff(struct file *file, void *priv,
2845 enum v4l2_buf_type type) 2845 enum v4l2_buf_type type)
2846{ 2846{
2847 struct bttv_fh *fh = priv; 2847 struct bttv_fh *fh = priv;
@@ -2857,7 +2857,7 @@ static int vidioc_streamoff(struct file *file, void *priv,
2857 return 0; 2857 return 0;
2858} 2858}
2859 2859
2860static int vidioc_queryctrl(struct file *file, void *priv, 2860static int bttv_queryctrl(struct file *file, void *priv,
2861 struct v4l2_queryctrl *c) 2861 struct v4l2_queryctrl *c)
2862{ 2862{
2863 struct bttv_fh *fh = priv; 2863 struct bttv_fh *fh = priv;
@@ -2880,7 +2880,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
2880 return 0; 2880 return 0;
2881} 2881}
2882 2882
2883static int vidioc_g_parm(struct file *file, void *f, 2883static int bttv_g_parm(struct file *file, void *f,
2884 struct v4l2_streamparm *parm) 2884 struct v4l2_streamparm *parm)
2885{ 2885{
2886 struct bttv_fh *fh = f; 2886 struct bttv_fh *fh = f;
@@ -2895,7 +2895,7 @@ static int vidioc_g_parm(struct file *file, void *f,
2895 return 0; 2895 return 0;
2896} 2896}
2897 2897
2898static int vidioc_g_tuner(struct file *file, void *priv, 2898static int bttv_g_tuner(struct file *file, void *priv,
2899 struct v4l2_tuner *t) 2899 struct v4l2_tuner *t)
2900{ 2900{
2901 struct bttv_fh *fh = priv; 2901 struct bttv_fh *fh = priv;
@@ -2923,7 +2923,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
2923 return 0; 2923 return 0;
2924} 2924}
2925 2925
2926static int vidioc_g_priority(struct file *file, void *f, enum v4l2_priority *p) 2926static int bttv_g_priority(struct file *file, void *f, enum v4l2_priority *p)
2927{ 2927{
2928 struct bttv_fh *fh = f; 2928 struct bttv_fh *fh = f;
2929 struct bttv *btv = fh->btv; 2929 struct bttv *btv = fh->btv;
@@ -2933,7 +2933,7 @@ static int vidioc_g_priority(struct file *file, void *f, enum v4l2_priority *p)
2933 return 0; 2933 return 0;
2934} 2934}
2935 2935
2936static int vidioc_s_priority(struct file *file, void *f, 2936static int bttv_s_priority(struct file *file, void *f,
2937 enum v4l2_priority prio) 2937 enum v4l2_priority prio)
2938{ 2938{
2939 struct bttv_fh *fh = f; 2939 struct bttv_fh *fh = f;
@@ -2942,7 +2942,7 @@ static int vidioc_s_priority(struct file *file, void *f,
2942 return v4l2_prio_change(&btv->prio, &fh->prio, prio); 2942 return v4l2_prio_change(&btv->prio, &fh->prio, prio);
2943} 2943}
2944 2944
2945static int vidioc_cropcap(struct file *file, void *priv, 2945static int bttv_cropcap(struct file *file, void *priv,
2946 struct v4l2_cropcap *cap) 2946 struct v4l2_cropcap *cap)
2947{ 2947{
2948 struct bttv_fh *fh = priv; 2948 struct bttv_fh *fh = priv;
@@ -2957,7 +2957,7 @@ static int vidioc_cropcap(struct file *file, void *priv,
2957 return 0; 2957 return 0;
2958} 2958}
2959 2959
2960static int vidioc_g_crop(struct file *file, void *f, struct v4l2_crop *crop) 2960static int bttv_g_crop(struct file *file, void *f, struct v4l2_crop *crop)
2961{ 2961{
2962 struct bttv_fh *fh = f; 2962 struct bttv_fh *fh = f;
2963 struct bttv *btv = fh->btv; 2963 struct bttv *btv = fh->btv;
@@ -2975,7 +2975,7 @@ static int vidioc_g_crop(struct file *file, void *f, struct v4l2_crop *crop)
2975 return 0; 2975 return 0;
2976} 2976}
2977 2977
2978static int vidioc_s_crop(struct file *file, void *f, struct v4l2_crop *crop) 2978static int bttv_s_crop(struct file *file, void *f, struct v4l2_crop *crop)
2979{ 2979{
2980 struct bttv_fh *fh = f; 2980 struct bttv_fh *fh = f;
2981 struct bttv *btv = fh->btv; 2981 struct bttv *btv = fh->btv;
@@ -3065,13 +3065,13 @@ static int vidioc_s_crop(struct file *file, void *f, struct v4l2_crop *crop)
3065 return 0; 3065 return 0;
3066} 3066}
3067 3067
3068static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a) 3068static int bttv_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
3069{ 3069{
3070 strcpy(a->name, "audio"); 3070 strcpy(a->name, "audio");
3071 return 0; 3071 return 0;
3072} 3072}
3073 3073
3074static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a) 3074static int bttv_s_audio(struct file *file, void *priv, struct v4l2_audio *a)
3075{ 3075{
3076 return 0; 3076 return 0;
3077} 3077}
@@ -3310,55 +3310,55 @@ static struct video_device bttv_video_template =
3310 VID_TYPE_CLIPPING|VID_TYPE_SCALES, 3310 VID_TYPE_CLIPPING|VID_TYPE_SCALES,
3311 .fops = &bttv_fops, 3311 .fops = &bttv_fops,
3312 .minor = -1, 3312 .minor = -1,
3313 .vidioc_querycap = vidioc_querycap, 3313 .vidioc_querycap = bttv_querycap,
3314 .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, 3314 .vidioc_enum_fmt_cap = bttv_enum_fmt_cap,
3315 .vidioc_g_fmt_cap = vidioc_g_fmt_cap, 3315 .vidioc_g_fmt_cap = bttv_g_fmt_cap,
3316 .vidioc_try_fmt_cap = vidioc_try_fmt_cap, 3316 .vidioc_try_fmt_cap = bttv_try_fmt_cap,
3317 .vidioc_s_fmt_cap = vidioc_s_fmt_cap, 3317 .vidioc_s_fmt_cap = bttv_s_fmt_cap,
3318 .vidioc_enum_fmt_overlay = vidioc_enum_fmt_overlay, 3318 .vidioc_enum_fmt_overlay = bttv_enum_fmt_overlay,
3319 .vidioc_g_fmt_overlay = vidioc_g_fmt_overlay, 3319 .vidioc_g_fmt_overlay = bttv_g_fmt_overlay,
3320 .vidioc_try_fmt_overlay = vidioc_try_fmt_overlay, 3320 .vidioc_try_fmt_overlay = bttv_try_fmt_overlay,
3321 .vidioc_s_fmt_overlay = vidioc_s_fmt_overlay, 3321 .vidioc_s_fmt_overlay = bttv_s_fmt_overlay,
3322 .vidioc_enum_fmt_vbi = vidioc_enum_fmt_vbi, 3322 .vidioc_enum_fmt_vbi = bttv_enum_fmt_vbi,
3323 .vidioc_g_fmt_vbi = vidioc_g_fmt_vbi, 3323 .vidioc_g_fmt_vbi = bttv_g_fmt_vbi,
3324 .vidioc_try_fmt_vbi = vidioc_try_fmt_vbi, 3324 .vidioc_try_fmt_vbi = bttv_try_fmt_vbi,
3325 .vidioc_s_fmt_vbi = vidioc_s_fmt_vbi, 3325 .vidioc_s_fmt_vbi = bttv_s_fmt_vbi,
3326 .vidioc_g_audio = vidioc_g_audio, 3326 .vidioc_g_audio = bttv_g_audio,
3327 .vidioc_s_audio = vidioc_s_audio, 3327 .vidioc_s_audio = bttv_s_audio,
3328 .vidioc_cropcap = vidioc_cropcap, 3328 .vidioc_cropcap = bttv_cropcap,
3329 .vidioc_reqbufs = vidioc_reqbufs, 3329 .vidioc_reqbufs = bttv_reqbufs,
3330 .vidioc_querybuf = vidioc_querybuf, 3330 .vidioc_querybuf = bttv_querybuf,
3331 .vidioc_qbuf = vidioc_qbuf, 3331 .vidioc_qbuf = bttv_qbuf,
3332 .vidioc_dqbuf = vidioc_dqbuf, 3332 .vidioc_dqbuf = bttv_dqbuf,
3333 .vidioc_s_std = vidioc_s_std, 3333 .vidioc_s_std = bttv_s_std,
3334 .vidioc_enum_input = vidioc_enum_input, 3334 .vidioc_enum_input = bttv_enum_input,
3335 .vidioc_g_input = vidioc_g_input, 3335 .vidioc_g_input = bttv_g_input,
3336 .vidioc_s_input = vidioc_s_input, 3336 .vidioc_s_input = bttv_s_input,
3337 .vidioc_queryctrl = vidioc_queryctrl, 3337 .vidioc_queryctrl = bttv_queryctrl,
3338 .vidioc_g_ctrl = vidioc_g_ctrl, 3338 .vidioc_g_ctrl = bttv_g_ctrl,
3339 .vidioc_s_ctrl = vidioc_s_ctrl, 3339 .vidioc_s_ctrl = bttv_s_ctrl,
3340 .vidioc_streamon = vidioc_streamon, 3340 .vidioc_streamon = bttv_streamon,
3341 .vidioc_streamoff = vidioc_streamoff, 3341 .vidioc_streamoff = bttv_streamoff,
3342 .vidioc_g_tuner = vidioc_g_tuner, 3342 .vidioc_g_tuner = bttv_g_tuner,
3343 .vidioc_s_tuner = vidioc_s_tuner, 3343 .vidioc_s_tuner = bttv_s_tuner,
3344#ifdef CONFIG_VIDEO_V4L1_COMPAT 3344#ifdef CONFIG_VIDEO_V4L1_COMPAT
3345 .vidiocgmbuf = vidiocgmbuf, 3345 .vidiocgmbuf = vidiocgmbuf,
3346#endif 3346#endif
3347 .vidioc_g_crop = vidioc_g_crop, 3347 .vidioc_g_crop = bttv_g_crop,
3348 .vidioc_g_crop = vidioc_g_crop, 3348 .vidioc_g_crop = bttv_g_crop,
3349 .vidioc_s_crop = vidioc_s_crop, 3349 .vidioc_s_crop = bttv_s_crop,
3350 .vidioc_g_fbuf = vidioc_g_fbuf, 3350 .vidioc_g_fbuf = bttv_g_fbuf,
3351 .vidioc_s_fbuf = vidioc_s_fbuf, 3351 .vidioc_s_fbuf = bttv_s_fbuf,
3352 .vidioc_overlay = vidioc_overlay, 3352 .vidioc_overlay = bttv_overlay,
3353 .vidioc_g_priority = vidioc_g_priority, 3353 .vidioc_g_priority = bttv_g_priority,
3354 .vidioc_s_priority = vidioc_s_priority, 3354 .vidioc_s_priority = bttv_s_priority,
3355 .vidioc_g_parm = vidioc_g_parm, 3355 .vidioc_g_parm = bttv_g_parm,
3356 .vidioc_g_frequency = vidioc_g_frequency, 3356 .vidioc_g_frequency = bttv_g_frequency,
3357 .vidioc_s_frequency = vidioc_s_frequency, 3357 .vidioc_s_frequency = bttv_s_frequency,
3358 .vidioc_log_status = vidioc_log_status, 3358 .vidioc_log_status = bttv_log_status,
3359 .vidioc_querystd = vidioc_querystd, 3359 .vidioc_querystd = bttv_querystd,
3360 .vidioc_g_register = vidioc_g_register, 3360 .vidioc_g_register = bttv_g_register,
3361 .vidioc_s_register = vidioc_s_register, 3361 .vidioc_s_register = bttv_s_register,
3362 .tvnorms = BTTV_NORMS, 3362 .tvnorms = BTTV_NORMS,
3363 .current_norm = V4L2_STD_PAL, 3363 .current_norm = V4L2_STD_PAL,
3364}; 3364};
@@ -3583,10 +3583,10 @@ static struct video_device radio_template =
3583 .vidioc_s_std = radio_s_std, 3583 .vidioc_s_std = radio_s_std,
3584 .vidioc_queryctrl = radio_queryctrl, 3584 .vidioc_queryctrl = radio_queryctrl,
3585 .vidioc_g_input = radio_g_input, 3585 .vidioc_g_input = radio_g_input,
3586 .vidioc_g_ctrl = vidioc_g_ctrl, 3586 .vidioc_g_ctrl = bttv_g_ctrl,
3587 .vidioc_s_ctrl = vidioc_s_ctrl, 3587 .vidioc_s_ctrl = bttv_s_ctrl,
3588 .vidioc_g_frequency = vidioc_g_frequency, 3588 .vidioc_g_frequency = bttv_g_frequency,
3589 .vidioc_s_frequency = vidioc_s_frequency, 3589 .vidioc_s_frequency = bttv_s_frequency,
3590}; 3590};
3591 3591
3592/* ----------------------------------------------------------------------- */ 3592/* ----------------------------------------------------------------------- */
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index da2708176aad..1f0cc79e2a33 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
306int vidioc_try_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) 306int bttv_try_fmt_vbi(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 vidioc_try_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
321} 321}
322 322
323 323
324int vidioc_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) 324int bttv_s_fmt_vbi(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 vidioc_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
369} 369}
370 370
371 371
372int vidioc_g_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) 372int bttv_g_fmt_vbi(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 260303065c13..1305d315cfc5 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -257,9 +257,9 @@ int bttv_overlay_risc(struct bttv *btv, struct bttv_overlay *ov,
257/* ---------------------------------------------------------- */ 257/* ---------------------------------------------------------- */
258/* bttv-vbi.c */ 258/* bttv-vbi.c */
259 259
260int vidioc_try_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); 260int bttv_try_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f);
261int vidioc_g_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); 261int bttv_g_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f);
262int vidioc_s_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f); 262int bttv_s_fmt_vbi(struct file *file, void *fh, struct v4l2_format *f);
263 263
264extern struct videobuf_queue_ops bttv_vbi_qops; 264extern struct videobuf_queue_ops bttv_vbi_qops;
265 265
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-25 21:08:40 -0500