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 /drivers/media/video/cx88/cx88-blackbird.c | |
| 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>
Diffstat (limited to 'drivers/media/video/cx88/cx88-blackbird.c')
| -rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 6c0c94c5ef91..fb67e4188b2f 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, |