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, 1 insertions, 20 deletions

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 20c1b33caf7b..2e15f43d26ec 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -327,8 +327,6 @@ static int attach_inform(struct i2c_client *client)
 
         d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
                 client->driver->driver.name, client->addr, client->name);
-        if (client->addr == 0x20 && client->driver && client->driver->command)
-                dev->mpeg_i2c_client = client;
 
         /* Am I an i2c remote control? */
 
@@ -357,7 +355,6 @@ static struct i2c_algorithm saa7134_algo = {
 
 static struct i2c_adapter saa7134_adap_template = {
         .owner         = THIS_MODULE,
-        .class         = I2C_CLASS_TV_ANALOG,
         .name          = "saa7134",
         .id            = I2C_HW_SAA7134,
         .algo          = &saa7134_algo,
@@ -421,29 +418,13 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
         }
 }
 
-void saa7134_i2c_call_clients(struct saa7134_dev *dev,
-                              unsigned int cmd, void *arg)
-{
-        BUG_ON(NULL == dev->i2c_adap.algo_data);
-        i2c_clients_command(&dev->i2c_adap, cmd, arg);
-}
-
-int saa7134_i2c_call_saa6752(struct saa7134_dev *dev,
-                                              unsigned int cmd, void *arg)
-{
-        if (dev->mpeg_i2c_client == NULL)
-                return -EINVAL;
-        return dev->mpeg_i2c_client->driver->command(dev->mpeg_i2c_client,
-                                                                cmd, arg);
-}
-EXPORT_SYMBOL_GPL(saa7134_i2c_call_saa6752);
-
 int saa7134_i2c_register(struct saa7134_dev *dev)
 {
         dev->i2c_adap = saa7134_adap_template;
         dev->i2c_adap.dev.parent = &dev->pci->dev;
         strcpy(dev->i2c_adap.name,dev->name);
         dev->i2c_adap.algo_data = dev;
+        i2c_set_adapdata(&dev->i2c_adap, &dev->v4l2_dev);
         i2c_add_adapter(&dev->i2c_adap);
 
         dev->i2c_client = saa7134_client_template;