V4L/DVB (10247): saa7134: convert to the new v4l2 framework.

Register v4l2_device and switch to v4l2_subdev to access the i2c modules.

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

1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index a1f7e351f572..193b07d83d1e 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -627,10 +627,10 @@ void saa7134_set_tvnorm_hw(struct saa7134_dev *dev)
         saa7134_set_decoder(dev);
 
         if (card_in(dev, dev->ctl_input).tv)
-                saa7134_i2c_call_clients(dev, VIDIOC_S_STD, &dev->tvnorm->id);
+                saa_call_all(dev, tuner, s_std, dev->tvnorm->id);
         /* Set the correct norm for the saa6752hs. This function
            does nothing if there is no saa6752hs. */
-        saa7134_i2c_call_saa6752(dev, VIDIOC_S_STD, &dev->tvnorm->id);
+        saa_call_empress(dev, tuner, s_std, dev->tvnorm->id);
 }
 
 static void set_h_prescale(struct saa7134_dev *dev, int task, int prescale)
@@ -1266,8 +1266,7 @@ int saa7134_s_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, str
                         else
                                 dev->tda9887_conf &= ~TDA9887_AUTOMUTE;
 
-                        saa7134_i2c_call_clients(dev, TUNER_SET_CONFIG,
-                                                 &tda9887_cfg);
+                        saa_call_all(dev, tuner, s_config, &tda9887_cfg);
                 }
                 break;
         }
@@ -1387,7 +1386,7 @@ static int video_open(struct file *file)
         if (fh->radio) {
                 /* switch to radio mode */
                 saa7134_tvaudio_setinput(dev,&card(dev).radio);
-                saa7134_i2c_call_clients(dev,AUDC_SET_RADIO, NULL);
+                saa_call_all(dev, tuner, s_radio);
         } else {
                 /* switch to video/vbi mode */
                 video_mux(dev,dev->ctl_input);
@@ -1498,7 +1497,7 @@ static int video_release(struct file *file)
         saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0);
         saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0);
 
-        saa7134_i2c_call_clients(dev, TUNER_SET_STANDBY, NULL);
+        saa_call_all(dev, core, s_standby, 0);
 
         /* free stuff */
         videobuf_mmap_free(&fh->cap);
@@ -2041,7 +2040,7 @@ static int saa7134_s_frequency(struct file *file, void *priv,
         mutex_lock(&dev->lock);
         dev->ctl_freq = f->frequency;
 
-        saa7134_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, f);
+        saa_call_all(dev, tuner, s_frequency, f);
 
         saa7134_tvaudio_do_scan(dev);
         mutex_unlock(&dev->lock);
@@ -2299,7 +2298,7 @@ static int radio_g_tuner(struct file *file, void *priv,
         strcpy(t->name, "Radio");
         t->type = V4L2_TUNER_RADIO;
 
-        saa7134_i2c_call_clients(dev, VIDIOC_G_TUNER, t);
+        saa_call_all(dev, tuner, g_tuner, t);
         if (dev->input->amux == TV) {
                 t->signal = 0xf800 - ((saa_readb(0x581) & 0x1f) << 11);
                 t->rxsubchans = (saa_readb(0x529) & 0x08) ?
@@ -2316,7 +2315,7 @@ static int radio_s_tuner(struct file *file, void *priv,
         if (0 != t->index)
                 return -EINVAL;
 
-        saa7134_i2c_call_clients(dev, VIDIOC_S_TUNER, t);
+        saa_call_all(dev, tuner, s_tuner, t);
         return 0;
 }