[media] v4l: subdev: Move [gs]_std operation to video ops

The g_std and s_std operations are video-related, move them to the video
ops where they belong.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

14 files changed, 27 insertions, 23 deletions

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index afcd53bfcf8e..da780f42b121 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -1182,7 +1182,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
                 break;
         }
         id = tvnorm->v4l2_id;
-        bttv_call_all(btv, core, s_std, id);
+        bttv_call_all(btv, video, s_std, id);
 
         return 0;
 }
diff --git a/drivers/media/pci/cx18/cx18-av-core.c b/drivers/media/pci/cx18/cx18-av-core.c
index c4890a430dc6..2d3afe0431a9 100644
--- a/drivers/media/pci/cx18/cx18-av-core.c
+++ b/drivers/media/pci/cx18/cx18-av-core.c
@@ -1263,7 +1263,6 @@ static const struct v4l2_subdev_core_ops cx18_av_general_ops = {
         .log_status = cx18_av_log_status,
         .load_fw = cx18_av_load_fw,
         .reset = cx18_av_reset,
-        .s_std = cx18_av_s_std,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         .g_register = cx18_av_g_register,
         .s_register = cx18_av_s_register,
@@ -1283,6 +1282,7 @@ static const struct v4l2_subdev_audio_ops cx18_av_audio_ops = {
 };
 
 static const struct v4l2_subdev_video_ops cx18_av_video_ops = {
+        .s_std = cx18_av_s_std,
         .s_routing = cx18_av_s_video_routing,
         .s_stream = cx18_av_s_stream,
         .s_mbus_fmt = cx18_av_s_mbus_fmt,
diff --git a/drivers/media/pci/cx18/cx18-fileops.c b/drivers/media/pci/cx18/cx18-fileops.c
index 4bfd865a4106..76a3b4ac541e 100644
--- a/drivers/media/pci/cx18/cx18-fileops.c
+++ b/drivers/media/pci/cx18/cx18-fileops.c
@@ -760,7 +760,7 @@ int cx18_v4l2_close(struct file *filp)
                 /* Mark that the radio is no longer in use */
                 clear_bit(CX18_F_I_RADIO_USER, &cx->i_flags);
                 /* Switch tuner to TV */
-                cx18_call_all(cx, core, s_std, cx->std);
+                cx18_call_all(cx, video, s_std, cx->std);
                 /* Select correct audio input (i.e. TV tuner or Line in) */
                 cx18_audio_set_io(cx);
                 if (atomic_read(&cx->ana_capturing) > 0) {
diff --git a/drivers/media/pci/cx18/cx18-gpio.c b/drivers/media/pci/cx18/cx18-gpio.c
index 5374aeb0cd22..38dc6b8f8254 100644
--- a/drivers/media/pci/cx18/cx18-gpio.c
+++ b/drivers/media/pci/cx18/cx18-gpio.c
@@ -180,7 +180,6 @@ static int gpiomux_s_audio_routing(struct v4l2_subdev *sd,
 
 static const struct v4l2_subdev_core_ops gpiomux_core_ops = {
         .log_status = gpiomux_log_status,
-        .s_std = gpiomux_s_std,
 };
 
 static const struct v4l2_subdev_tuner_ops gpiomux_tuner_ops = {
@@ -191,10 +190,15 @@ static const struct v4l2_subdev_audio_ops gpiomux_audio_ops = {
         .s_routing = gpiomux_s_audio_routing,
 };
 
+static const struct v4l2_subdev_video_ops gpiomux_video_ops = {
+        .s_std = gpiomux_s_std,
+};
+
 static const struct v4l2_subdev_ops gpiomux_ops = {
         .core = &gpiomux_core_ops,
         .tuner = &gpiomux_tuner_ops,
         .audio = &gpiomux_audio_ops,
+        .video = &gpiomux_video_ops,
 };
 
 /*
diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c
index 1110bcb14e2f..fefb2cd35838 100644
--- a/drivers/media/pci/cx18/cx18-ioctl.c
+++ b/drivers/media/pci/cx18/cx18-ioctl.c
@@ -602,7 +602,7 @@ int cx18_s_std(struct file *file, void *fh, v4l2_std_id std)
                         (unsigned long long) cx->std);
 
         /* Tuner */
-        cx18_call_all(cx, core, s_std, cx->std);
+        cx18_call_all(cx, video, s_std, cx->std);
         return 0;
 }
 
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
index 7891f34157d1..e0a59523cf3c 100644
--- a/drivers/media/pci/cx23885/cx23885-video.c
+++ b/drivers/media/pci/cx23885/cx23885-video.c
@@ -326,7 +326,7 @@ int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
 
         dev->tvnorm = norm;
 
-        call_all(dev, core, s_std, norm);
+        call_all(dev, video, s_std, norm);
 
         return 0;
 }
@@ -1589,7 +1589,7 @@ static int cx23885_set_freq_via_ops(struct cx23885_dev *dev,
                 fe = &dev->ts1.analog_fe;
 
         if (fe && fe->ops.tuner_ops.set_analog_params) {
-                call_all(dev, core, s_std, dev->tvnorm);
+                call_all(dev, video, s_std, dev->tvnorm);
                 fe->ops.tuner_ops.set_analog_params(fe, &params);
         }
         else
diff --git a/drivers/media/pci/cx88/cx88-core.c b/drivers/media/pci/cx88/cx88-core.c
index ad59dc9235ae..e061c88b697e 100644
--- a/drivers/media/pci/cx88/cx88-core.c
+++ b/drivers/media/pci/cx88/cx88-core.c
@@ -1012,7 +1012,7 @@ int cx88_set_tvnorm(struct cx88_core *core, v4l2_std_id norm)
         set_tvaudio(core);
 
         // tell i2c chips
-        call_all(core, core, s_std, norm);
+        call_all(core, video, s_std, norm);
 
         /* The chroma_agc control should be inaccessible if the video format is SECAM */
         v4l2_ctrl_grab(core->chroma_agc, cxiformat == VideoFormatSECAM);
diff --git a/drivers/media/pci/ivtv/ivtv-fileops.c b/drivers/media/pci/ivtv/ivtv-fileops.c
index 9caffd8aa995..e5ff6277ca85 100644
--- a/drivers/media/pci/ivtv/ivtv-fileops.c
+++ b/drivers/media/pci/ivtv/ivtv-fileops.c
@@ -894,7 +894,7 @@ int ivtv_v4l2_close(struct file *filp)
                 /* Mark that the radio is no longer in use */
                 clear_bit(IVTV_F_I_RADIO_USER, &itv->i_flags);
                 /* Switch tuner to TV */
-                ivtv_call_all(itv, core, s_std, itv->std);
+                ivtv_call_all(itv, video, s_std, itv->std);
                 /* Select correct audio input (i.e. TV tuner or Line in) */
                 ivtv_audio_set_io(itv);
                 if (itv->hw_flags & IVTV_HW_SAA711X) {
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 807b275a847e..b3667a00db3a 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -1090,7 +1090,7 @@ void ivtv_s_std_enc(struct ivtv *itv, v4l2_std_id std)
                 itv->vbi.sliced_decoder_line_size = itv->is_60hz ? 272 : 284;
 
         /* Tuner */
-        ivtv_call_all(itv, core, s_std, itv->std);
+        ivtv_call_all(itv, video, s_std, itv->std);
 }
 
 void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id std)
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index f1452da0a76d..d37599980768 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -477,10 +477,10 @@ void saa7134_set_tvnorm_hw(struct saa7134_dev *dev)
         saa7134_set_decoder(dev);
 
         if (card_in(dev, dev->ctl_input).tv)
-                saa_call_all(dev, core, s_std, dev->tvnorm->id);
+                saa_call_all(dev, video, s_std, dev->tvnorm->id);
         /* Set the correct norm for the saa6752hs. This function
            does nothing if there is no saa6752hs. */
-        saa_call_empress(dev, core, s_std, dev->tvnorm->id);
+        saa_call_empress(dev, video, s_std, dev->tvnorm->id);
 }
 
 static void set_h_prescale(struct saa7134_dev *dev, int task, int prescale)
diff --git a/drivers/media/pci/saa7146/mxb.c b/drivers/media/pci/saa7146/mxb.c
index 33abe332d175..c4c8fce8f2b4 100644
--- a/drivers/media/pci/saa7146/mxb.c
+++ b/drivers/media/pci/saa7146/mxb.c
@@ -357,7 +357,7 @@ static int mxb_init_done(struct saa7146_dev* dev)
         tea6420_route(mxb, 6);
 
         /* select video mode in saa7111a */
-        saa7111a_call(mxb, core, s_std, std);
+        saa7111a_call(mxb, video, s_std, std);
 
         /* select tuner-output on saa7111a */
         i = 0;
@@ -379,8 +379,8 @@ static int mxb_init_done(struct saa7146_dev* dev)
         /* These two gpio calls set the GPIO pins that control the tda9820 */
         saa7146_write(dev, GPIO_CTRL, 0x00404050);
         saa7111a_call(mxb, core, s_gpio, 1);
-        saa7111a_call(mxb, core, s_std, std);
-        tuner_call(mxb, core, s_std, std);
+        saa7111a_call(mxb, video, s_std, std);
+        tuner_call(mxb, video, s_std, std);
 
         /* switch to tuner-channel on tea6415c */
         tea6415c_call(mxb, video, s_routing, 3, 17, 0);
@@ -771,9 +771,9 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standa
                 /* These two gpio calls set the GPIO pins that control the tda9820 */
                 saa7146_write(dev, GPIO_CTRL, 0x00404050);
                 saa7111a_call(mxb, core, s_gpio, 0);
-                saa7111a_call(mxb, core, s_std, std);
+                saa7111a_call(mxb, video, s_std, std);
                 if (mxb->cur_input == 0)
-                        tuner_call(mxb, core, s_std, std);
+                        tuner_call(mxb, video, s_std, std);
         } else {
                 v4l2_std_id std = V4L2_STD_PAL_BG;
 
@@ -783,9 +783,9 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standa
                 /* These two gpio calls set the GPIO pins that control the tda9820 */
                 saa7146_write(dev, GPIO_CTRL, 0x00404050);
                 saa7111a_call(mxb, core, s_gpio, 1);
-                saa7111a_call(mxb, core, s_std, std);
+                saa7111a_call(mxb, video, s_std, std);
                 if (mxb->cur_input == 0)
-                        tuner_call(mxb, core, s_std, std);
+                        tuner_call(mxb, video, s_std, std);
         }
         return 0;
 }
diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
index 7559951b2ea4..d2abd3b5c2bf 100644
--- a/drivers/media/pci/sta2x11/sta2x11_vip.c
+++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
@@ -444,7 +444,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id std)
         int status;
 
         if (V4L2_STD_ALL == std) {
-                v4l2_subdev_call(vip->decoder, core, s_std, std);
+                v4l2_subdev_call(vip->decoder, video, s_std, std);
                 ssleep(2);
                 v4l2_subdev_call(vip->decoder, video, querystd, &newstd);
                 v4l2_subdev_call(vip->decoder, video, g_input_status, &status);
@@ -467,7 +467,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id std)
                         vip->format = formats_50[0];
         }
 
-        return v4l2_subdev_call(vip->decoder, core, s_std, std);
+        return v4l2_subdev_call(vip->decoder, video, s_std, std);
 }
 
 /**
diff --git a/drivers/media/pci/zoran/zoran_device.c b/drivers/media/pci/zoran/zoran_device.c
index 519164c572c8..bf34b93f23ee 100644
--- a/drivers/media/pci/zoran/zoran_device.c
+++ b/drivers/media/pci/zoran/zoran_device.c
@@ -1572,7 +1572,7 @@ zoran_init_hardware (struct zoran *zr)
         }
 
         decoder_call(zr, core, init, 0);
-        decoder_call(zr, core, s_std, zr->norm);
+        decoder_call(zr, video, s_std, zr->norm);
         decoder_call(zr, video, s_routing,
                 zr->card.input[zr->input].muxsel, 0, 0);
 
diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
index e7e9840c6c35..099d5fbebb7c 100644
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -1469,7 +1469,7 @@ zoran_set_norm (struct zoran *zr,
         if (on)
                 zr36057_overlay(zr, 0);
 
-        decoder_call(zr, core, s_std, norm);
+        decoder_call(zr, video, s_std, norm);
         encoder_call(zr, video, s_std_output, norm);
 
         if (on)