V4L/DVB: v4l: move vbi-specific video ops to a new vbi ops struct

Only a relatively small number of video receivers and transmitters actually
support VBI. So start moving the vbi specific ops to an ops struct of their
own.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c
index 3ce45297e56a..4454997c1bf4 100644
--- a/drivers/media/video/cx18/cx18-av-core.c
+++ b/drivers/media/video/cx18/cx18-av-core.c
@@ -1403,17 +1403,21 @@ static const struct v4l2_subdev_audio_ops cx18_av_audio_ops = {
 
 static const struct v4l2_subdev_video_ops cx18_av_video_ops = {
         .s_routing = cx18_av_s_video_routing,
-        .decode_vbi_line = cx18_av_decode_vbi_line,
         .s_stream = cx18_av_s_stream,
         .g_fmt = cx18_av_g_fmt,
         .s_fmt = cx18_av_s_fmt,
 };
 
+static const struct v4l2_subdev_vbi_ops cx18_av_vbi_ops = {
+        .decode_vbi_line = cx18_av_decode_vbi_line,
+};
+
 static const struct v4l2_subdev_ops cx18_av_ops = {
         .core = &cx18_av_general_ops,
         .tuner = &cx18_av_tuner_ops,
         .audio = &cx18_av_audio_ops,
         .video = &cx18_av_video_ops,
+        .vbi = &cx18_av_vbi_ops,
 };
 
 int cx18_av_probe(struct cx18 *cx)
diff --git a/drivers/media/video/cx18/cx18-vbi.c b/drivers/media/video/cx18/cx18-vbi.c
index 574c1c6974f8..582227522cf0 100644
--- a/drivers/media/video/cx18/cx18-vbi.c
+++ b/drivers/media/video/cx18/cx18-vbi.c
@@ -174,7 +174,7 @@ static u32 compress_sliced_buf(struct cx18 *cx, u8 *buf, u32 size,
                      p[3] != sliced_vbi_eav_rp[1]))
                         continue;
                 vbi.p = p + 4;
-                v4l2_subdev_call(cx->sd_av, video, decode_vbi_line, &vbi);
+                v4l2_subdev_call(cx->sd_av, vbi, decode_vbi_line, &vbi);
                 if (vbi.type) {
                         cx->vbi.sliced_data[line].id = vbi.type;
                         cx->vbi.sliced_data[line].field = vbi.is_second_field;