From 8f6908e83716e686d20b3b2425ebaa238b0ec55e Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 8 May 2010 17:20:00 -0300
Subject: [PATCH] --- yaml --- r: 199951 b: refs/heads/master c:
 c1658cafd1910cbec1b546ecd1f76e8fc99fc513 h: refs/heads/master i:   199949:
 f7738e64a73e33be5a3350d1253b66ad380bacd1   199947:
 76ee2a002452cd8f4a69f57abe2bc9aa70c67013   199943:
 6ec107d0c334fb4c75b8651c3d034a5ec1133e93   199935:
 69a1d15a172234347c18dd1d2bdad59ce4a760d6 v: v3

---
 [refs]                                        |  2 +-
 .../media/video/cx25840/cx25840-core.c        | 31 -------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/[refs] b/[refs]
index 06103735c092..fd186988b4e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 112cb4a8a092a6338a0e2309aac134e502f2a489
+refs/heads/master: c1658cafd1910cbec1b546ecd1f76e8fc99fc513
diff --git a/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/drivers/media/video/cx25840/cx25840-core.c
index f0cbc9d066bd..bb4872b2ceb0 100644
--- a/trunk/drivers/media/video/cx25840/cx25840-core.c
+++ b/trunk/drivers/media/video/cx25840/cx25840-core.c
@@ -1014,17 +1014,6 @@ static int cx25840_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 
 /* ----------------------------------------------------------------------- */
 
-static int cx25840_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-	switch (fmt->type) {
-	case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
-		return cx25840_g_sliced_fmt(sd, &fmt->fmt.sliced);
-	default:
-		return -EINVAL;
-	}
-	return 0;
-}
-
 static int cx25840_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
 {
 	struct cx25840_state *state = to_state(sd);
@@ -1081,24 +1070,6 @@ static int cx25840_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt
 	return 0;
 }
 
-static int cx25840_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
-{
-	struct v4l2_mbus_framefmt mbus_fmt;
-
-	switch (fmt->type) {
-	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-		mbus_fmt.width = fmt->fmt.pix.width;
-		mbus_fmt.height = fmt->fmt.pix.height;
-		mbus_fmt.code = V4L2_MBUS_FMT_FIXED;
-		return cx25840_s_mbus_fmt(sd, &mbus_fmt);
-
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
 /* ----------------------------------------------------------------------- */
 
 static void log_video_status(struct i2c_client *client)
@@ -1640,8 +1611,6 @@ static const struct v4l2_subdev_audio_ops cx25840_audio_ops = {
 
 static const struct v4l2_subdev_video_ops cx25840_video_ops = {
 	.s_routing = cx25840_s_video_routing,
-	.g_fmt = cx25840_g_fmt,
-	.s_fmt = cx25840_s_fmt,
 	.s_mbus_fmt = cx25840_s_mbus_fmt,
 	.s_stream = cx25840_s_stream,
 };