aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/tvp5150.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 47f0582d50a5..1654f65cca7c 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -934,17 +934,6 @@ static int tvp5150_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
934 return 0; 934 return 0;
935} 935}
936 936
937static int tvp5150_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
938{
939 switch (fmt->type) {
940 case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
941 return tvp5150_s_sliced_fmt(sd, &fmt->fmt.sliced);
942
943 default:
944 return -EINVAL;
945 }
946}
947
948static int tvp5150_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *svbi) 937static int tvp5150_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *svbi)
949{ 938{
950 int i, mask = 0; 939 int i, mask = 0;
@@ -960,13 +949,6 @@ static int tvp5150_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
960 return 0; 949 return 0;
961} 950}
962 951
963static int tvp5150_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
964{
965 if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)
966 return -EINVAL;
967 return tvp5150_g_sliced_fmt(sd, &fmt->fmt.sliced);
968}
969
970static int tvp5150_g_chip_ident(struct v4l2_subdev *sd, 952static int tvp5150_g_chip_ident(struct v4l2_subdev *sd,
971 struct v4l2_dbg_chip_ident *chip) 953 struct v4l2_dbg_chip_ident *chip)
972{ 954{
@@ -1054,8 +1036,6 @@ static const struct v4l2_subdev_tuner_ops tvp5150_tuner_ops = {
1054 1036
1055static const struct v4l2_subdev_video_ops tvp5150_video_ops = { 1037static const struct v4l2_subdev_video_ops tvp5150_video_ops = {
1056 .s_routing = tvp5150_s_routing, 1038 .s_routing = tvp5150_s_routing,
1057 .g_fmt = tvp5150_g_fmt,
1058 .s_fmt = tvp5150_s_fmt,
1059}; 1039};
1060 1040
1061static const struct v4l2_subdev_vbi_ops tvp5150_vbi_ops = { 1041static const struct v4l2_subdev_vbi_ops tvp5150_vbi_ops = {