summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx25840
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-05-08 17:20:00 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-06-01 01:21:31 -0300
commitc1658cafd1910cbec1b546ecd1f76e8fc99fc513 (patch)
tree631f8fbcd11bf3101ad5cbe29cf1eb2097fac38d /drivers/media/video/cx25840
parent112cb4a8a092a6338a0e2309aac134e502f2a489 (diff)
V4L/DVB: cx24850: remove obsolete g/s_fmt ops
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx25840')
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index f0cbc9d066b..bb4872b2ceb 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/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,
};