diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-05-01 16:07:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 12:58:52 -0300 |
| commit | aae6e33f8df8845603880468624ca29edf4bac64 (patch) | |
| tree | 6744783468f29dfb5afabe3fc5cd82776a596992 /drivers/media | |
| parent | 4a61ecbd344c2349ec3b7a8db0db128135285dd7 (diff) | |
| download | linux-3.10-aae6e33f8df8845603880468624ca29edf4bac64.tar.gz linux-3.10-aae6e33f8df8845603880468624ca29edf4bac64.tar.bz2 linux-3.10-aae6e33f8df8845603880468624ca29edf4bac64.zip | |
V4L/DVB: cx18/cx25840/saa7115/tvp5150: remove vbi support from s_fmt
Now that s_fmt is no longer used for VBI format setup in subdevs, remove
the VBI support from s_fmt.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/cx18/cx18-av-core.c | 6 | ||||
| -rw-r--r-- | drivers/media/video/cx25840/cx25840-core.c | 6 | ||||
| -rw-r--r-- | drivers/media/video/saa7115.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/tvp5150.c | 3 |
4 files changed, 0 insertions, 19 deletions
diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c index c0289230209..0e5006b1427 100644 --- a/drivers/media/video/cx18/cx18-av-core.c +++ b/drivers/media/video/cx18/cx18-av-core.c @@ -1098,12 +1098,6 @@ static int cx18_av_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt) cx18_av_write(cx, 0x41e, 0x8 | filter); break; - case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: - return cx18_av_s_sliced_fmt(sd, &fmt->fmt.sliced); - - case V4L2_BUF_TYPE_VBI_CAPTURE: - return cx18_av_s_raw_fmt(sd, &fmt->fmt.vbi); - default: return -EINVAL; } diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index a20df8c184e..8b6fb354437 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c @@ -1079,12 +1079,6 @@ static int cx25840_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt) cx25840_write(client, 0x41e, 0x8 | filter); break; - case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: - return cx25840_s_sliced_fmt(sd, &fmt->fmt.sliced); - - case V4L2_BUF_TYPE_VBI_CAPTURE: - return cx25840_s_raw_fmt(sd, &fmt->fmt.vbi); - default: return -EINVAL; } diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index cf77318ede4..53b6fcde380 100644 --- a/drivers/media/video/saa7115.c +++ b/drivers/media/video/saa7115.c @@ -1138,10 +1138,6 @@ static int saa711x_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f static int saa711x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt) { - if (fmt->type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) - return saa711x_s_sliced_fmt(sd, &fmt->fmt.sliced); - if (fmt->type == V4L2_BUF_TYPE_VBI_CAPTURE) - return saa711x_s_raw_fmt(sd, &fmt->fmt.vbi); if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return -EINVAL; diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index 853dd6f39b9..47f0582d50a 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c @@ -937,9 +937,6 @@ static int tvp5150_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f static int tvp5150_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt) { switch (fmt->type) { - case V4L2_BUF_TYPE_VBI_CAPTURE: - return tvp5150_s_raw_fmt(sd, &fmt->fmt.vbi); - case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: return tvp5150_s_sliced_fmt(sd, &fmt->fmt.sliced); |