diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-video.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 178 |
1 files changed, 89 insertions, 89 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 043e1396857a..6f9f9dbdfdd1 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -1123,7 +1123,7 @@ static struct videobuf_queue_ops video_qops = { | |||
1123 | 1123 | ||
1124 | /* ------------------------------------------------------------------ */ | 1124 | /* ------------------------------------------------------------------ */ |
1125 | 1125 | ||
1126 | static int vidioc_g_ctrl(struct file *file, void *priv, | 1126 | static int saa7134_g_ctrl(struct file *file, void *priv, |
1127 | struct v4l2_control *c) | 1127 | struct v4l2_control *c) |
1128 | { | 1128 | { |
1129 | struct saa7134_fh *fh = priv; | 1129 | struct saa7134_fh *fh = priv; |
@@ -1173,7 +1173,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv, | |||
1173 | return 0; | 1173 | return 0; |
1174 | } | 1174 | } |
1175 | 1175 | ||
1176 | static int vidioc_s_ctrl(struct file *file, void *f, | 1176 | static int saa7134_s_ctrl(struct file *file, void *f, |
1177 | struct v4l2_control *c) | 1177 | struct v4l2_control *c) |
1178 | { | 1178 | { |
1179 | const struct v4l2_queryctrl* ctrl; | 1179 | const struct v4l2_queryctrl* ctrl; |
@@ -1507,7 +1507,7 @@ static int video_mmap(struct file *file, struct vm_area_struct * vma) | |||
1507 | 1507 | ||
1508 | /* ------------------------------------------------------------------ */ | 1508 | /* ------------------------------------------------------------------ */ |
1509 | 1509 | ||
1510 | static int vidioc_try_get_set_fmt_vbi(struct file *file, void *priv, | 1510 | static int saa7134_try_get_set_fmt_vbi(struct file *file, void *priv, |
1511 | struct v4l2_format *f) | 1511 | struct v4l2_format *f) |
1512 | { | 1512 | { |
1513 | struct saa7134_fh *fh = priv; | 1513 | struct saa7134_fh *fh = priv; |
@@ -1527,7 +1527,7 @@ static int vidioc_try_get_set_fmt_vbi(struct file *file, void *priv, | |||
1527 | return 0; | 1527 | return 0; |
1528 | } | 1528 | } |
1529 | 1529 | ||
1530 | static int vidioc_g_fmt_cap(struct file *file, void *priv, | 1530 | static int saa7134_g_fmt_cap(struct file *file, void *priv, |
1531 | struct v4l2_format *f) | 1531 | struct v4l2_format *f) |
1532 | { | 1532 | { |
1533 | struct saa7134_fh *fh = priv; | 1533 | struct saa7134_fh *fh = priv; |
@@ -1543,7 +1543,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv, | |||
1543 | return 0; | 1543 | return 0; |
1544 | } | 1544 | } |
1545 | 1545 | ||
1546 | static int vidioc_g_fmt_overlay(struct file *file, void *priv, | 1546 | static int saa7134_g_fmt_overlay(struct file *file, void *priv, |
1547 | struct v4l2_format *f) | 1547 | struct v4l2_format *f) |
1548 | { | 1548 | { |
1549 | struct saa7134_fh *fh = priv; | 1549 | struct saa7134_fh *fh = priv; |
@@ -1557,7 +1557,7 @@ static int vidioc_g_fmt_overlay(struct file *file, void *priv, | |||
1557 | return 0; | 1557 | return 0; |
1558 | } | 1558 | } |
1559 | 1559 | ||
1560 | static int vidioc_try_fmt_cap(struct file *file, void *priv, | 1560 | static int saa7134_try_fmt_cap(struct file *file, void *priv, |
1561 | struct v4l2_format *f) | 1561 | struct v4l2_format *f) |
1562 | { | 1562 | { |
1563 | struct saa7134_fh *fh = priv; | 1563 | struct saa7134_fh *fh = priv; |
@@ -1608,7 +1608,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv, | |||
1608 | return 0; | 1608 | return 0; |
1609 | } | 1609 | } |
1610 | 1610 | ||
1611 | static int vidioc_try_fmt_overlay(struct file *file, void *priv, | 1611 | static int saa7134_try_fmt_overlay(struct file *file, void *priv, |
1612 | struct v4l2_format *f) | 1612 | struct v4l2_format *f) |
1613 | { | 1613 | { |
1614 | struct saa7134_fh *fh = priv; | 1614 | struct saa7134_fh *fh = priv; |
@@ -1622,13 +1622,13 @@ static int vidioc_try_fmt_overlay(struct file *file, void *priv, | |||
1622 | return verify_preview(dev, &f->fmt.win); | 1622 | return verify_preview(dev, &f->fmt.win); |
1623 | } | 1623 | } |
1624 | 1624 | ||
1625 | static int vidioc_s_fmt_cap(struct file *file, void *priv, | 1625 | static int saa7134_s_fmt_cap(struct file *file, void *priv, |
1626 | struct v4l2_format *f) | 1626 | struct v4l2_format *f) |
1627 | { | 1627 | { |
1628 | struct saa7134_fh *fh = priv; | 1628 | struct saa7134_fh *fh = priv; |
1629 | int err; | 1629 | int err; |
1630 | 1630 | ||
1631 | err = vidioc_try_fmt_cap(file, priv, f); | 1631 | err = saa7134_try_fmt_cap(file, priv, f); |
1632 | if (0 != err) | 1632 | if (0 != err) |
1633 | return err; | 1633 | return err; |
1634 | 1634 | ||
@@ -1639,7 +1639,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, | |||
1639 | return 0; | 1639 | return 0; |
1640 | } | 1640 | } |
1641 | 1641 | ||
1642 | static int vidioc_s_fmt_overlay(struct file *file, void *priv, | 1642 | static int saa7134_s_fmt_overlay(struct file *file, void *priv, |
1643 | struct v4l2_format *f) | 1643 | struct v4l2_format *f) |
1644 | { | 1644 | { |
1645 | struct saa7134_fh *fh = priv; | 1645 | struct saa7134_fh *fh = priv; |
@@ -1680,7 +1680,7 @@ static int vidioc_s_fmt_overlay(struct file *file, void *priv, | |||
1680 | return 0; | 1680 | return 0; |
1681 | } | 1681 | } |
1682 | 1682 | ||
1683 | static int vidioc_queryctrl(struct file *file, void *priv, | 1683 | static int saa7134_queryctrl(struct file *file, void *priv, |
1684 | struct v4l2_queryctrl *c) | 1684 | struct v4l2_queryctrl *c) |
1685 | { | 1685 | { |
1686 | const struct v4l2_queryctrl *ctrl; | 1686 | const struct v4l2_queryctrl *ctrl; |
@@ -1695,7 +1695,7 @@ static int vidioc_queryctrl(struct file *file, void *priv, | |||
1695 | return 0; | 1695 | return 0; |
1696 | } | 1696 | } |
1697 | 1697 | ||
1698 | static int vidioc_enum_input(struct file *file, void *priv, | 1698 | static int saa7134_enum_input(struct file *file, void *priv, |
1699 | struct v4l2_input *i) | 1699 | struct v4l2_input *i) |
1700 | { | 1700 | { |
1701 | struct saa7134_fh *fh = priv; | 1701 | struct saa7134_fh *fh = priv; |
@@ -1729,7 +1729,7 @@ static int vidioc_enum_input(struct file *file, void *priv, | |||
1729 | return 0; | 1729 | return 0; |
1730 | } | 1730 | } |
1731 | 1731 | ||
1732 | static int vidioc_g_input(struct file *file, void *priv, unsigned int *i) | 1732 | static int saa7134_g_input(struct file *file, void *priv, unsigned int *i) |
1733 | { | 1733 | { |
1734 | struct saa7134_fh *fh = priv; | 1734 | struct saa7134_fh *fh = priv; |
1735 | struct saa7134_dev *dev = fh->dev; | 1735 | struct saa7134_dev *dev = fh->dev; |
@@ -1738,7 +1738,7 @@ static int vidioc_g_input(struct file *file, void *priv, unsigned int *i) | |||
1738 | return 0; | 1738 | return 0; |
1739 | } | 1739 | } |
1740 | 1740 | ||
1741 | static int vidioc_s_input(struct file *file, void *priv, unsigned int i) | 1741 | static int saa7134_s_input(struct file *file, void *priv, unsigned int i) |
1742 | { | 1742 | { |
1743 | struct saa7134_fh *fh = priv; | 1743 | struct saa7134_fh *fh = priv; |
1744 | struct saa7134_dev *dev = fh->dev; | 1744 | struct saa7134_dev *dev = fh->dev; |
@@ -1758,7 +1758,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i) | |||
1758 | return 0; | 1758 | return 0; |
1759 | } | 1759 | } |
1760 | 1760 | ||
1761 | static int vidioc_querycap(struct file *file, void *priv, | 1761 | static int saa7134_querycap(struct file *file, void *priv, |
1762 | struct v4l2_capability *cap) | 1762 | struct v4l2_capability *cap) |
1763 | { | 1763 | { |
1764 | struct saa7134_fh *fh = priv; | 1764 | struct saa7134_fh *fh = priv; |
@@ -1785,7 +1785,7 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
1785 | return 0; | 1785 | return 0; |
1786 | } | 1786 | } |
1787 | 1787 | ||
1788 | static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * id) | 1788 | static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id) |
1789 | { | 1789 | { |
1790 | struct saa7134_fh *fh = priv; | 1790 | struct saa7134_fh *fh = priv; |
1791 | struct saa7134_dev *dev = fh->dev; | 1791 | struct saa7134_dev *dev = fh->dev; |
@@ -1847,7 +1847,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * id) | |||
1847 | return 0; | 1847 | return 0; |
1848 | } | 1848 | } |
1849 | 1849 | ||
1850 | static int vidioc_cropcap(struct file *file, void *priv, | 1850 | static int saa7134_cropcap(struct file *file, void *priv, |
1851 | struct v4l2_cropcap *cap) | 1851 | struct v4l2_cropcap *cap) |
1852 | { | 1852 | { |
1853 | struct saa7134_fh *fh = priv; | 1853 | struct saa7134_fh *fh = priv; |
@@ -1871,7 +1871,7 @@ static int vidioc_cropcap(struct file *file, void *priv, | |||
1871 | return 0; | 1871 | return 0; |
1872 | } | 1872 | } |
1873 | 1873 | ||
1874 | static int vidioc_g_crop(struct file *file, void *f, struct v4l2_crop *crop) | 1874 | static int saa7134_g_crop(struct file *file, void *f, struct v4l2_crop *crop) |
1875 | { | 1875 | { |
1876 | struct saa7134_fh *fh = f; | 1876 | struct saa7134_fh *fh = f; |
1877 | struct saa7134_dev *dev = fh->dev; | 1877 | struct saa7134_dev *dev = fh->dev; |
@@ -1883,7 +1883,7 @@ static int vidioc_g_crop(struct file *file, void *f, struct v4l2_crop *crop) | |||
1883 | return 0; | 1883 | return 0; |
1884 | } | 1884 | } |
1885 | 1885 | ||
1886 | static int vidioc_s_crop(struct file *file, void *f, struct v4l2_crop *crop) | 1886 | static int saa7134_s_crop(struct file *file, void *f, struct v4l2_crop *crop) |
1887 | { | 1887 | { |
1888 | struct saa7134_fh *fh = f; | 1888 | struct saa7134_fh *fh = f; |
1889 | struct saa7134_dev *dev = fh->dev; | 1889 | struct saa7134_dev *dev = fh->dev; |
@@ -1920,7 +1920,7 @@ static int vidioc_s_crop(struct file *file, void *f, struct v4l2_crop *crop) | |||
1920 | return 0; | 1920 | return 0; |
1921 | } | 1921 | } |
1922 | 1922 | ||
1923 | static int vidioc_g_tuner(struct file *file, void *priv, | 1923 | static int saa7134_g_tuner(struct file *file, void *priv, |
1924 | struct v4l2_tuner *t) | 1924 | struct v4l2_tuner *t) |
1925 | { | 1925 | { |
1926 | struct saa7134_fh *fh = priv; | 1926 | struct saa7134_fh *fh = priv; |
@@ -1949,7 +1949,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
1949 | return 0; | 1949 | return 0; |
1950 | } | 1950 | } |
1951 | 1951 | ||
1952 | static int vidioc_s_tuner(struct file *file, void *priv, | 1952 | static int saa7134_s_tuner(struct file *file, void *priv, |
1953 | struct v4l2_tuner *t) | 1953 | struct v4l2_tuner *t) |
1954 | { | 1954 | { |
1955 | struct saa7134_fh *fh = priv; | 1955 | struct saa7134_fh *fh = priv; |
@@ -1971,7 +1971,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, | |||
1971 | return 0; | 1971 | return 0; |
1972 | } | 1972 | } |
1973 | 1973 | ||
1974 | static int vidioc_g_frequency(struct file *file, void *priv, | 1974 | static int saa7134_g_frequency(struct file *file, void *priv, |
1975 | struct v4l2_frequency *f) | 1975 | struct v4l2_frequency *f) |
1976 | { | 1976 | { |
1977 | struct saa7134_fh *fh = priv; | 1977 | struct saa7134_fh *fh = priv; |
@@ -1983,7 +1983,7 @@ static int vidioc_g_frequency(struct file *file, void *priv, | |||
1983 | return 0; | 1983 | return 0; |
1984 | } | 1984 | } |
1985 | 1985 | ||
1986 | static int vidioc_s_frequency(struct file *file, void *priv, | 1986 | static int saa7134_s_frequency(struct file *file, void *priv, |
1987 | struct v4l2_frequency *f) | 1987 | struct v4l2_frequency *f) |
1988 | { | 1988 | { |
1989 | struct saa7134_fh *fh = priv; | 1989 | struct saa7134_fh *fh = priv; |
@@ -2010,18 +2010,18 @@ static int vidioc_s_frequency(struct file *file, void *priv, | |||
2010 | return 0; | 2010 | return 0; |
2011 | } | 2011 | } |
2012 | 2012 | ||
2013 | static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a) | 2013 | static int saa7134_g_audio(struct file *file, void *priv, struct v4l2_audio *a) |
2014 | { | 2014 | { |
2015 | strcpy(a->name, "audio"); | 2015 | strcpy(a->name, "audio"); |
2016 | return 0; | 2016 | return 0; |
2017 | } | 2017 | } |
2018 | 2018 | ||
2019 | static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a) | 2019 | static int saa7134_s_audio(struct file *file, void *priv, struct v4l2_audio *a) |
2020 | { | 2020 | { |
2021 | return 0; | 2021 | return 0; |
2022 | } | 2022 | } |
2023 | 2023 | ||
2024 | static int vidioc_g_priority(struct file *file, void *f, enum v4l2_priority *p) | 2024 | static int saa7134_g_priority(struct file *file, void *f, enum v4l2_priority *p) |
2025 | { | 2025 | { |
2026 | struct saa7134_fh *fh = f; | 2026 | struct saa7134_fh *fh = f; |
2027 | struct saa7134_dev *dev = fh->dev; | 2027 | struct saa7134_dev *dev = fh->dev; |
@@ -2030,7 +2030,7 @@ static int vidioc_g_priority(struct file *file, void *f, enum v4l2_priority *p) | |||
2030 | return 0; | 2030 | return 0; |
2031 | } | 2031 | } |
2032 | 2032 | ||
2033 | static int vidioc_s_priority(struct file *file, void *f, | 2033 | static int saa7134_s_priority(struct file *file, void *f, |
2034 | enum v4l2_priority prio) | 2034 | enum v4l2_priority prio) |
2035 | { | 2035 | { |
2036 | struct saa7134_fh *fh = f; | 2036 | struct saa7134_fh *fh = f; |
@@ -2039,7 +2039,7 @@ static int vidioc_s_priority(struct file *file, void *f, | |||
2039 | return v4l2_prio_change(&dev->prio, &fh->prio, prio); | 2039 | return v4l2_prio_change(&dev->prio, &fh->prio, prio); |
2040 | } | 2040 | } |
2041 | 2041 | ||
2042 | static int vidioc_enum_fmt_cap(struct file *file, void *priv, | 2042 | static int saa7134_enum_fmt_cap(struct file *file, void *priv, |
2043 | struct v4l2_fmtdesc *f) | 2043 | struct v4l2_fmtdesc *f) |
2044 | { | 2044 | { |
2045 | if (f->index >= FORMATS) | 2045 | if (f->index >= FORMATS) |
@@ -2053,7 +2053,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *priv, | |||
2053 | return 0; | 2053 | return 0; |
2054 | } | 2054 | } |
2055 | 2055 | ||
2056 | static int vidioc_enum_fmt_overlay(struct file *file, void *priv, | 2056 | static int saa7134_enum_fmt_overlay(struct file *file, void *priv, |
2057 | struct v4l2_fmtdesc *f) | 2057 | struct v4l2_fmtdesc *f) |
2058 | { | 2058 | { |
2059 | if (saa7134_no_overlay > 0) { | 2059 | if (saa7134_no_overlay > 0) { |
@@ -2072,7 +2072,7 @@ static int vidioc_enum_fmt_overlay(struct file *file, void *priv, | |||
2072 | return 0; | 2072 | return 0; |
2073 | } | 2073 | } |
2074 | 2074 | ||
2075 | static int vidioc_enum_fmt_vbi(struct file *file, void *priv, | 2075 | static int saa7134_enum_fmt_vbi(struct file *file, void *priv, |
2076 | struct v4l2_fmtdesc *f) | 2076 | struct v4l2_fmtdesc *f) |
2077 | { | 2077 | { |
2078 | if (0 != f->index) | 2078 | if (0 != f->index) |
@@ -2084,7 +2084,7 @@ static int vidioc_enum_fmt_vbi(struct file *file, void *priv, | |||
2084 | return 0; | 2084 | return 0; |
2085 | } | 2085 | } |
2086 | 2086 | ||
2087 | static int vidioc_g_fbuf(struct file *file, void *f, | 2087 | static int saa7134_g_fbuf(struct file *file, void *f, |
2088 | struct v4l2_framebuffer *fb) | 2088 | struct v4l2_framebuffer *fb) |
2089 | { | 2089 | { |
2090 | struct saa7134_fh *fh = f; | 2090 | struct saa7134_fh *fh = f; |
@@ -2096,7 +2096,7 @@ static int vidioc_g_fbuf(struct file *file, void *f, | |||
2096 | return 0; | 2096 | return 0; |
2097 | } | 2097 | } |
2098 | 2098 | ||
2099 | static int vidioc_s_fbuf(struct file *file, void *f, | 2099 | static int saa7134_s_fbuf(struct file *file, void *f, |
2100 | struct v4l2_framebuffer *fb) | 2100 | struct v4l2_framebuffer *fb) |
2101 | { | 2101 | { |
2102 | struct saa7134_fh *fh = f; | 2102 | struct saa7134_fh *fh = f; |
@@ -2121,7 +2121,7 @@ static int vidioc_s_fbuf(struct file *file, void *f, | |||
2121 | return 0; | 2121 | return 0; |
2122 | } | 2122 | } |
2123 | 2123 | ||
2124 | static int vidioc_overlay(struct file *file, void *f, unsigned int on) | 2124 | static int saa7134_overlay(struct file *file, void *f, unsigned int on) |
2125 | { | 2125 | { |
2126 | struct saa7134_fh *fh = f; | 2126 | struct saa7134_fh *fh = f; |
2127 | struct saa7134_dev *dev = fh->dev; | 2127 | struct saa7134_dev *dev = fh->dev; |
@@ -2158,34 +2158,34 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf) | |||
2158 | } | 2158 | } |
2159 | #endif | 2159 | #endif |
2160 | 2160 | ||
2161 | static int vidioc_reqbufs(struct file *file, void *priv, | 2161 | static int saa7134_reqbufs(struct file *file, void *priv, |
2162 | struct v4l2_requestbuffers *p) | 2162 | struct v4l2_requestbuffers *p) |
2163 | { | 2163 | { |
2164 | struct saa7134_fh *fh = priv; | 2164 | struct saa7134_fh *fh = priv; |
2165 | return videobuf_reqbufs(saa7134_queue(fh), p); | 2165 | return videobuf_reqbufs(saa7134_queue(fh), p); |
2166 | } | 2166 | } |
2167 | 2167 | ||
2168 | static int vidioc_querybuf(struct file *file, void *priv, | 2168 | static int saa7134_querybuf(struct file *file, void *priv, |
2169 | struct v4l2_buffer *b) | 2169 | struct v4l2_buffer *b) |
2170 | { | 2170 | { |
2171 | struct saa7134_fh *fh = priv; | 2171 | struct saa7134_fh *fh = priv; |
2172 | return videobuf_querybuf(saa7134_queue(fh), b); | 2172 | return videobuf_querybuf(saa7134_queue(fh), b); |
2173 | } | 2173 | } |
2174 | 2174 | ||
2175 | static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *b) | 2175 | static int saa7134_qbuf(struct file *file, void *priv, struct v4l2_buffer *b) |
2176 | { | 2176 | { |
2177 | struct saa7134_fh *fh = priv; | 2177 | struct saa7134_fh *fh = priv; |
2178 | return videobuf_qbuf(saa7134_queue(fh), b); | 2178 | return videobuf_qbuf(saa7134_queue(fh), b); |
2179 | } | 2179 | } |
2180 | 2180 | ||
2181 | static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) | 2181 | static int saa7134_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) |
2182 | { | 2182 | { |
2183 | struct saa7134_fh *fh = priv; | 2183 | struct saa7134_fh *fh = priv; |
2184 | return videobuf_dqbuf(saa7134_queue(fh), b, | 2184 | return videobuf_dqbuf(saa7134_queue(fh), b, |
2185 | file->f_flags & O_NONBLOCK); | 2185 | file->f_flags & O_NONBLOCK); |
2186 | } | 2186 | } |
2187 | 2187 | ||
2188 | static int vidioc_streamon(struct file *file, void *priv, | 2188 | static int saa7134_streamon(struct file *file, void *priv, |
2189 | enum v4l2_buf_type type) | 2189 | enum v4l2_buf_type type) |
2190 | { | 2190 | { |
2191 | struct saa7134_fh *fh = priv; | 2191 | struct saa7134_fh *fh = priv; |
@@ -2198,7 +2198,7 @@ static int vidioc_streamon(struct file *file, void *priv, | |||
2198 | return videobuf_streamon(saa7134_queue(fh)); | 2198 | return videobuf_streamon(saa7134_queue(fh)); |
2199 | } | 2199 | } |
2200 | 2200 | ||
2201 | static int vidioc_streamoff(struct file *file, void *priv, | 2201 | static int saa7134_streamoff(struct file *file, void *priv, |
2202 | enum v4l2_buf_type type) | 2202 | enum v4l2_buf_type type) |
2203 | { | 2203 | { |
2204 | int err; | 2204 | int err; |
@@ -2213,7 +2213,7 @@ static int vidioc_streamoff(struct file *file, void *priv, | |||
2213 | return 0; | 2213 | return 0; |
2214 | } | 2214 | } |
2215 | 2215 | ||
2216 | static int vidioc_g_parm(struct file *file, void *fh, | 2216 | static int saa7134_g_parm(struct file *file, void *fh, |
2217 | struct v4l2_streamparm *parm) | 2217 | struct v4l2_streamparm *parm) |
2218 | { | 2218 | { |
2219 | return 0; | 2219 | return 0; |
@@ -2358,50 +2358,50 @@ struct video_device saa7134_video_template = | |||
2358 | VID_TYPE_CLIPPING|VID_TYPE_SCALES, | 2358 | VID_TYPE_CLIPPING|VID_TYPE_SCALES, |
2359 | .fops = &video_fops, | 2359 | .fops = &video_fops, |
2360 | .minor = -1, | 2360 | .minor = -1, |
2361 | .vidioc_querycap = vidioc_querycap, | 2361 | .vidioc_querycap = saa7134_querycap, |
2362 | .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, | 2362 | .vidioc_enum_fmt_cap = saa7134_enum_fmt_cap, |
2363 | .vidioc_g_fmt_cap = vidioc_g_fmt_cap, | 2363 | .vidioc_g_fmt_cap = saa7134_g_fmt_cap, |
2364 | .vidioc_try_fmt_cap = vidioc_try_fmt_cap, | 2364 | .vidioc_try_fmt_cap = saa7134_try_fmt_cap, |
2365 | .vidioc_s_fmt_cap = vidioc_s_fmt_cap, | 2365 | .vidioc_s_fmt_cap = saa7134_s_fmt_cap, |
2366 | .vidioc_enum_fmt_overlay = vidioc_enum_fmt_overlay, | 2366 | .vidioc_enum_fmt_overlay = saa7134_enum_fmt_overlay, |
2367 | .vidioc_g_fmt_overlay = vidioc_g_fmt_overlay, | 2367 | .vidioc_g_fmt_overlay = saa7134_g_fmt_overlay, |
2368 | .vidioc_try_fmt_overlay = vidioc_try_fmt_overlay, | 2368 | .vidioc_try_fmt_overlay = saa7134_try_fmt_overlay, |
2369 | .vidioc_s_fmt_overlay = vidioc_s_fmt_overlay, | 2369 | .vidioc_s_fmt_overlay = saa7134_s_fmt_overlay, |
2370 | .vidioc_enum_fmt_vbi = vidioc_enum_fmt_vbi, | 2370 | .vidioc_enum_fmt_vbi = saa7134_enum_fmt_vbi, |
2371 | .vidioc_g_fmt_vbi = vidioc_try_get_set_fmt_vbi, | 2371 | .vidioc_g_fmt_vbi = saa7134_try_get_set_fmt_vbi, |
2372 | .vidioc_try_fmt_vbi = vidioc_try_get_set_fmt_vbi, | 2372 | .vidioc_try_fmt_vbi = saa7134_try_get_set_fmt_vbi, |
2373 | .vidioc_s_fmt_vbi = vidioc_try_get_set_fmt_vbi, | 2373 | .vidioc_s_fmt_vbi = saa7134_try_get_set_fmt_vbi, |
2374 | .vidioc_g_audio = vidioc_g_audio, | 2374 | .vidioc_g_audio = saa7134_g_audio, |
2375 | .vidioc_s_audio = vidioc_s_audio, | 2375 | .vidioc_s_audio = saa7134_s_audio, |
2376 | .vidioc_cropcap = vidioc_cropcap, | 2376 | .vidioc_cropcap = saa7134_cropcap, |
2377 | .vidioc_reqbufs = vidioc_reqbufs, | 2377 | .vidioc_reqbufs = saa7134_reqbufs, |
2378 | .vidioc_querybuf = vidioc_querybuf, | 2378 | .vidioc_querybuf = saa7134_querybuf, |
2379 | .vidioc_qbuf = vidioc_qbuf, | 2379 | .vidioc_qbuf = saa7134_qbuf, |
2380 | .vidioc_dqbuf = vidioc_dqbuf, | 2380 | .vidioc_dqbuf = saa7134_dqbuf, |
2381 | .vidioc_s_std = vidioc_s_std, | 2381 | .vidioc_s_std = saa7134_s_std, |
2382 | .vidioc_enum_input = vidioc_enum_input, | 2382 | .vidioc_enum_input = saa7134_enum_input, |
2383 | .vidioc_g_input = vidioc_g_input, | 2383 | .vidioc_g_input = saa7134_g_input, |
2384 | .vidioc_s_input = vidioc_s_input, | 2384 | .vidioc_s_input = saa7134_s_input, |
2385 | .vidioc_queryctrl = vidioc_queryctrl, | 2385 | .vidioc_queryctrl = saa7134_queryctrl, |
2386 | .vidioc_g_ctrl = vidioc_g_ctrl, | 2386 | .vidioc_g_ctrl = saa7134_g_ctrl, |
2387 | .vidioc_s_ctrl = vidioc_s_ctrl, | 2387 | .vidioc_s_ctrl = saa7134_s_ctrl, |
2388 | .vidioc_streamon = vidioc_streamon, | 2388 | .vidioc_streamon = saa7134_streamon, |
2389 | .vidioc_streamoff = vidioc_streamoff, | 2389 | .vidioc_streamoff = saa7134_streamoff, |
2390 | .vidioc_g_tuner = vidioc_g_tuner, | 2390 | .vidioc_g_tuner = saa7134_g_tuner, |
2391 | .vidioc_s_tuner = vidioc_s_tuner, | 2391 | .vidioc_s_tuner = saa7134_s_tuner, |
2392 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | 2392 | #ifdef CONFIG_VIDEO_V4L1_COMPAT |
2393 | .vidiocgmbuf = vidiocgmbuf, | 2393 | .vidiocgmbuf = vidiocgmbuf, |
2394 | #endif | 2394 | #endif |
2395 | .vidioc_g_crop = vidioc_g_crop, | 2395 | .vidioc_g_crop = saa7134_g_crop, |
2396 | .vidioc_s_crop = vidioc_s_crop, | 2396 | .vidioc_s_crop = saa7134_s_crop, |
2397 | .vidioc_g_fbuf = vidioc_g_fbuf, | 2397 | .vidioc_g_fbuf = saa7134_g_fbuf, |
2398 | .vidioc_s_fbuf = vidioc_s_fbuf, | 2398 | .vidioc_s_fbuf = saa7134_s_fbuf, |
2399 | .vidioc_overlay = vidioc_overlay, | 2399 | .vidioc_overlay = saa7134_overlay, |
2400 | .vidioc_g_priority = vidioc_g_priority, | 2400 | .vidioc_g_priority = saa7134_g_priority, |
2401 | .vidioc_s_priority = vidioc_s_priority, | 2401 | .vidioc_s_priority = saa7134_s_priority, |
2402 | .vidioc_g_parm = vidioc_g_parm, | 2402 | .vidioc_g_parm = saa7134_g_parm, |
2403 | .vidioc_g_frequency = vidioc_g_frequency, | 2403 | .vidioc_g_frequency = saa7134_g_frequency, |
2404 | .vidioc_s_frequency = vidioc_s_frequency, | 2404 | .vidioc_s_frequency = saa7134_s_frequency, |
2405 | .tvnorms = SAA7134_NORMS, | 2405 | .tvnorms = SAA7134_NORMS, |
2406 | .current_norm = V4L2_STD_PAL, | 2406 | .current_norm = V4L2_STD_PAL, |
2407 | }; | 2407 | }; |
@@ -2416,10 +2416,10 @@ struct video_device saa7134_vbi_template = | |||
2416 | 2416 | ||
2417 | struct video_device saa7134_radio_template = | 2417 | struct video_device saa7134_radio_template = |
2418 | { | 2418 | { |
2419 | .name = "saa7134-radio", | 2419 | .name = "saa7134-radio", |
2420 | .type = VID_TYPE_TUNER, | 2420 | .type = VID_TYPE_TUNER, |
2421 | .fops = &radio_fops, | 2421 | .fops = &radio_fops, |
2422 | .minor = -1, | 2422 | .minor = -1, |
2423 | .vidioc_querycap = radio_querycap, | 2423 | .vidioc_querycap = radio_querycap, |
2424 | .vidioc_g_tuner = radio_g_tuner, | 2424 | .vidioc_g_tuner = radio_g_tuner, |
2425 | .vidioc_enum_input = radio_enum_input, | 2425 | .vidioc_enum_input = radio_enum_input, |
@@ -2430,10 +2430,10 @@ struct video_device saa7134_radio_template = | |||
2430 | .vidioc_s_std = radio_s_std, | 2430 | .vidioc_s_std = radio_s_std, |
2431 | .vidioc_queryctrl = radio_queryctrl, | 2431 | .vidioc_queryctrl = radio_queryctrl, |
2432 | .vidioc_g_input = radio_g_input, | 2432 | .vidioc_g_input = radio_g_input, |
2433 | .vidioc_g_ctrl = vidioc_g_ctrl, | 2433 | .vidioc_g_ctrl = saa7134_g_ctrl, |
2434 | .vidioc_s_ctrl = vidioc_s_ctrl, | 2434 | .vidioc_s_ctrl = saa7134_s_ctrl, |
2435 | .vidioc_g_frequency = vidioc_g_frequency, | 2435 | .vidioc_g_frequency = saa7134_g_frequency, |
2436 | .vidioc_s_frequency = vidioc_s_frequency, | 2436 | .vidioc_s_frequency = saa7134_s_frequency, |
2437 | }; | 2437 | }; |
2438 | 2438 | ||
2439 | int saa7134_video_init1(struct saa7134_dev *dev) | 2439 | int saa7134_video_init1(struct saa7134_dev *dev) |