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, 10 insertions, 12 deletions

diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index c9d8beb87a60..d9d9607044a7 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -76,7 +76,7 @@ static int ts_init_encoder(struct saa7134_dev* dev)
                 break;
         }
         ts_reset_encoder(dev);
-        saa7134_i2c_call_clients(dev, VIDIOC_INT_INIT, &leading_null_bytes);
+        saa_call_all(dev, core, init, leading_null_bytes);
         dev->empress_started = 1;
         return 0;
 }
@@ -234,7 +234,7 @@ static int empress_g_fmt_vid_cap(struct file *file, void *priv,
 {
         struct saa7134_dev *dev = file->private_data;
 
-        saa7134_i2c_call_clients(dev, VIDIOC_G_FMT, f);
+        saa_call_all(dev, video, g_fmt, f);
 
         f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
         f->fmt.pix.sizeimage    = TS_PACKET_SIZE * dev->ts.nr_packets;
@@ -247,7 +247,7 @@ static int empress_s_fmt_vid_cap(struct file *file, void *priv,
 {
         struct saa7134_dev *dev = file->private_data;
 
-        saa7134_i2c_call_clients(dev, VIDIOC_S_FMT, f);
+        saa_call_all(dev, video, s_fmt, f);
 
         f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
         f->fmt.pix.sizeimage    = TS_PACKET_SIZE * dev->ts.nr_packets;
@@ -317,7 +317,7 @@ static int empress_s_ext_ctrls(struct file *file, void *priv,
         if (ctrls->ctrl_class != V4L2_CTRL_CLASS_MPEG)
                 return -EINVAL;
 
-        err = saa7134_i2c_call_saa6752(dev, VIDIOC_S_EXT_CTRLS, ctrls);
+        err = saa_call_empress(dev, core, s_ext_ctrls, ctrls);
         ts_init_encoder(dev);
 
         return err;
@@ -330,7 +330,7 @@ static int empress_g_ext_ctrls(struct file *file, void *priv,
 
         if (ctrls->ctrl_class != V4L2_CTRL_CLASS_MPEG)
                 return -EINVAL;
-        return saa7134_i2c_call_saa6752(dev, VIDIOC_G_EXT_CTRLS, ctrls);
+        return saa_call_empress(dev, core, g_ext_ctrls, ctrls);
 }
 
 static int empress_g_ctrl(struct file *file, void *priv,
@@ -391,7 +391,7 @@ static int empress_queryctrl(struct file *file, void *priv,
                 return v4l2_ctrl_query_fill_std(c);
         if (V4L2_CTRL_ID2CLASS(c->id) != V4L2_CTRL_CLASS_MPEG)
                 return saa7134_queryctrl(file, priv, c);
-        return saa7134_i2c_call_saa6752(dev, VIDIOC_QUERYCTRL, c);
+        return saa_call_empress(dev, core, queryctrl, c);
 }
 
 static int empress_querymenu(struct file *file, void *priv,
@@ -401,7 +401,7 @@ static int empress_querymenu(struct file *file, void *priv,
 
         if (V4L2_CTRL_ID2CLASS(c->id) != V4L2_CTRL_CLASS_MPEG)
                 return -EINVAL;
-        return saa7134_i2c_call_saa6752(dev, VIDIOC_QUERYMENU, c);
+        return saa_call_empress(dev, core, querymenu, c);
 }
 
 static int empress_g_chip_ident(struct file *file, void *fh,
@@ -411,14 +411,12 @@ static int empress_g_chip_ident(struct file *file, void *fh,
 
         chip->ident = V4L2_IDENT_NONE;
         chip->revision = 0;
-        if (dev->mpeg_i2c_client == NULL)
-                return -EINVAL;
         if (chip->match.type == V4L2_CHIP_MATCH_I2C_DRIVER &&
             !strcmp(chip->match.name, "saa6752hs"))
-                return saa7134_i2c_call_saa6752(dev, VIDIOC_DBG_G_CHIP_IDENT, chip);
+                return saa_call_empress(dev, core, g_chip_ident, chip);
         if (chip->match.type == V4L2_CHIP_MATCH_I2C_ADDR &&
-            chip->match.addr == dev->mpeg_i2c_client->addr)
-                return saa7134_i2c_call_saa6752(dev, VIDIOC_DBG_G_CHIP_IDENT, chip);
+            chip->match.addr == 0x20)
+                return saa_call_empress(dev, core, g_chip_ident, chip);
         return -EINVAL;
 }