diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-05-08 16:20:35 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-06-01 00:21:32 -0400 |
commit | 029ed3261021c76f0b8538a2f715d89506555676 (patch) | |
tree | e37ab910955c32ff58c2d6f79d77c08c56ca6cea /drivers/media/video/saa7115.c | |
parent | c1658cafd1910cbec1b546ecd1f76e8fc99fc513 (diff) |
V4L/DVB: saa7115: 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/saa7115.c')
-rw-r--r-- | drivers/media/video/saa7115.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index d4cc20859975..76da74368680 100644 --- a/drivers/media/video/saa7115.c +++ b/drivers/media/video/saa7115.c | |||
@@ -1117,13 +1117,6 @@ static int saa711x_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f | |||
1117 | return 0; | 1117 | return 0; |
1118 | } | 1118 | } |
1119 | 1119 | ||
1120 | static int saa711x_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt) | ||
1121 | { | ||
1122 | if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) | ||
1123 | return -EINVAL; | ||
1124 | return saa711x_g_sliced_fmt(sd, &fmt->fmt.sliced); | ||
1125 | } | ||
1126 | |||
1127 | static int saa711x_s_raw_fmt(struct v4l2_subdev *sd, struct v4l2_vbi_format *fmt) | 1120 | static int saa711x_s_raw_fmt(struct v4l2_subdev *sd, struct v4l2_vbi_format *fmt) |
1128 | { | 1121 | { |
1129 | saa711x_set_lcr(sd, NULL); | 1122 | saa711x_set_lcr(sd, NULL); |
@@ -1145,14 +1138,6 @@ static int saa711x_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt | |||
1145 | return saa711x_set_size(sd, fmt->width, fmt->height); | 1138 | return saa711x_set_size(sd, fmt->width, fmt->height); |
1146 | } | 1139 | } |
1147 | 1140 | ||
1148 | static int saa711x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt) | ||
1149 | { | ||
1150 | if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
1151 | return -EINVAL; | ||
1152 | |||
1153 | return saa711x_set_size(sd, fmt->fmt.pix.width, fmt->fmt.pix.height); | ||
1154 | } | ||
1155 | |||
1156 | /* Decode the sliced VBI data stream as created by the saa7115. | 1141 | /* Decode the sliced VBI data stream as created by the saa7115. |
1157 | The format is described in the saa7115 datasheet in Tables 25 and 26 | 1142 | The format is described in the saa7115 datasheet in Tables 25 and 26 |
1158 | and in Figure 33. | 1143 | and in Figure 33. |
@@ -1565,8 +1550,6 @@ static const struct v4l2_subdev_audio_ops saa711x_audio_ops = { | |||
1565 | static const struct v4l2_subdev_video_ops saa711x_video_ops = { | 1550 | static const struct v4l2_subdev_video_ops saa711x_video_ops = { |
1566 | .s_routing = saa711x_s_routing, | 1551 | .s_routing = saa711x_s_routing, |
1567 | .s_crystal_freq = saa711x_s_crystal_freq, | 1552 | .s_crystal_freq = saa711x_s_crystal_freq, |
1568 | .g_fmt = saa711x_g_fmt, | ||
1569 | .s_fmt = saa711x_s_fmt, | ||
1570 | .s_mbus_fmt = saa711x_s_mbus_fmt, | 1553 | .s_mbus_fmt = saa711x_s_mbus_fmt, |
1571 | .s_stream = saa711x_s_stream, | 1554 | .s_stream = saa711x_s_stream, |
1572 | .querystd = saa711x_querystd, | 1555 | .querystd = saa711x_querystd, |