[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>

1 files changed, 7 insertions, 7 deletions

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;
 }