---

yaml --- r: 193122 b: refs/heads/master c: aae6e33 h: refs/heads/master v: v3
git-mirror · May 19, 2010 · c5b2a2e · c5b2a2e
1 parent 0c71e2f
commit c5b2a2e
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 20 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a61ecbd344c2349ec3b7a8db0db128135285dd7
+refs/heads/master: aae6e33f8df8845603880468624ca29edf4bac64
diff --git a/trunk/drivers/media/video/cx18/cx18-av-core.c b/trunk/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/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/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/trunk/drivers/media/video/saa7115.c b/trunk/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/trunk/drivers/media/video/tvp5150.c b/trunk/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);