V4L/DVB (11370): v4l2-subdev: move s_std from tuner to core.

s_std didn't belong in the tuner ops. Stricly speaking it should be part of
the video ops, but it is used by audio and tuner devices as well, so it is
more efficient to make it part of the core ops.

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

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c
index e0223deed35e..25e565f0502a 100644
--- a/drivers/media/video/zoran/zoran_device.c
+++ b/drivers/media/video/zoran/zoran_device.c
@@ -1584,7 +1584,7 @@ zoran_init_hardware (struct zoran *zr)
         route.input = zr->card.input[zr->input].muxsel;
 
         decoder_call(zr, core, init, 0);
-        decoder_call(zr, tuner, s_std, zr->norm);
+        decoder_call(zr, core, s_std, zr->norm);
         decoder_call(zr, video, s_routing, &route);
 
         encoder_call(zr, core, init, 0);
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index f16e57cf11e4..979e8d0e80f5 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1449,7 +1449,7 @@ zoran_set_norm (struct zoran *zr,
                 v4l2_std_id std = 0;
 
                 decoder_call(zr, video, querystd, &std);
-                decoder_call(zr, tuner, s_std, std);
+                decoder_call(zr, core, s_std, std);
 
                 /* let changes come into effect */
                 ssleep(2);
@@ -1461,7 +1461,7 @@ zoran_set_norm (struct zoran *zr,
                                 "%s: %s - no norm detected\n",
                                 ZR_DEVNAME(zr), __func__);
                         /* reset norm */
-                        decoder_call(zr, tuner, s_std, zr->norm);
+                        decoder_call(zr, core, s_std, zr->norm);
                         return -EIO;
                 }
 
@@ -1480,7 +1480,7 @@ zoran_set_norm (struct zoran *zr,
         if (on)
                 zr36057_overlay(zr, 0);
 
-        decoder_call(zr, tuner, s_std, norm);
+        decoder_call(zr, core, s_std, norm);
         encoder_call(zr, video, s_std_output, norm);
 
         if (on)