aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx25840
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-05-08 16:20:00 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-06-01 00:21:31 -0400
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)
1014 1014
1015/* ----------------------------------------------------------------------- */ 1015/* ----------------------------------------------------------------------- */
1016 1016
1017static int cx25840_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
1018{
1019 switch (fmt->type) {
1020 case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
1021 return cx25840_g_sliced_fmt(sd, &fmt->fmt.sliced);
1022 default:
1023 return -EINVAL;
1024 }
1025 return 0;
1026}
1027
1028static int cx25840_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt) 1017static int cx25840_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
1029{ 1018{
1030 struct cx25840_state *state = to_state(sd); 1019 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
1081 return 0; 1070 return 0;
1082} 1071}
1083 1072
1084static int cx25840_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
1085{
1086 struct v4l2_mbus_framefmt mbus_fmt;
1087
1088 switch (fmt->type) {
1089 case V4L2_BUF_TYPE_VIDEO_CAPTURE:
1090 mbus_fmt.width = fmt->fmt.pix.width;
1091 mbus_fmt.height = fmt->fmt.pix.height;
1092 mbus_fmt.code = V4L2_MBUS_FMT_FIXED;
1093 return cx25840_s_mbus_fmt(sd, &mbus_fmt);
1094
1095 default:
1096 return -EINVAL;
1097 }
1098
1099 return 0;
1100}
1101
1102/* ----------------------------------------------------------------------- */ 1073/* ----------------------------------------------------------------------- */
1103 1074
1104static void log_video_status(struct i2c_client *client) 1075static void log_video_status(struct i2c_client *client)
@@ -1640,8 +1611,6 @@ static const struct v4l2_subdev_audio_ops cx25840_audio_ops = {
1640 1611
1641static const struct v4l2_subdev_video_ops cx25840_video_ops = { 1612static const struct v4l2_subdev_video_ops cx25840_video_ops = {
1642 .s_routing = cx25840_s_video_routing, 1613 .s_routing = cx25840_s_video_routing,
1643 .g_fmt = cx25840_g_fmt,
1644 .s_fmt = cx25840_s_fmt,
1645 .s_mbus_fmt = cx25840_s_mbus_fmt, 1614 .s_mbus_fmt = cx25840_s_mbus_fmt,
1646 .s_stream = cx25840_s_stream, 1615 .s_stream = cx25840_s_stream,
1647}; 1616};