V4L/DVB (11297): cx23885: convert to v4l2_subdev.

[mirror_ubuntu-zesty-kernel.git] / drivers / media / video / cx23885 / cx23885-i2c.c

diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index f98e476e96172c9aa8b3865e437b07d98d7fa548..3421bd12056a95ee58a4604ca380354f4ccb444c 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -131,7 +131,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
                        printk(" >\n");
        }
 
-       for (cnt = 1; cnt < msg->len; cnt++ ) {
+       for (cnt = 1; cnt < msg->len; cnt++) {
                /* following bytes */
                wdata = msg->buf[cnt];
                ctrl = bus->i2c_period | (1 << 12) | (1 << 2);
@@ -151,9 +151,9 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
                if (retval == 0)
                        goto eio;
                if (i2c_debug) {
-                       printk(" %02x", msg->buf[cnt]);
+                       dprintk(1, " %02x", msg->buf[cnt]);
                        if (!(ctrl & I2C_NOSTOP))
-                               printk(" >\n");
+                               dprintk(1, " >\n");
                }
        }
        return msg->len;
@@ -162,7 +162,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
        retval = -EIO;
  err:
        if (i2c_debug)
-               printk(" ERR: %d\n", retval);
+               printk(KERN_ERR " ERR: %d\n", retval);
        return retval;
 }
 
@@ -194,12 +194,12 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
 
        if (i2c_debug) {
                if (joined)
-                       printk(" R");
+                       dprintk(1, " R");
                else
-                       printk(" <R %02x", (msg->addr << 1) + 1);
+                       dprintk(1, " <R %02x", (msg->addr << 1) + 1);
        }
 
-       for(cnt = 0; cnt < msg->len; cnt++) {
+       for (cnt = 0; cnt < msg->len; cnt++) {
 
                ctrl = bus->i2c_period | (1 << 12) | (1 << 2) | 1;
 
@@ -216,9 +216,9 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
                        goto eio;
                msg->buf[cnt] = cx_read(bus->reg_rdata) & 0xff;
                if (i2c_debug) {
-                       printk(" %02x", msg->buf[cnt]);
+                       dprintk(1, " %02x", msg->buf[cnt]);
                        if (!(ctrl & I2C_NOSTOP))
-                               printk(" >\n");
+                               dprintk(1, " >\n");
                }
        }
        return msg->len;
@@ -227,7 +227,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
        retval = -EIO;
  err:
        if (i2c_debug)
-               printk(" ERR: %d\n", retval);
+               printk(KERN_ERR " ERR: %d\n", retval);
        return retval;
 }
 
@@ -268,64 +268,6 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap,
        return retval;
 }
 
-static int attach_inform(struct i2c_client *client)
-{
-       struct cx23885_i2c *bus = i2c_get_adapdata(client->adapter);
-       struct cx23885_dev *dev = bus->dev;
-       struct tuner_setup tun_setup;
-
-       dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
-               client->driver->driver.name, client->addr, client->name);
-
-       if (!client->driver->command)
-               return 0;
-
-       if (dev->tuner_type != UNSET) {
-
-               dprintk(1, "%s  (tuner) i2c attach [addr=0x%x,client=%s]\n",
-                       client->driver->driver.name, client->addr,
-                       client->name);
-
-               if ((dev->tuner_addr == ADDR_UNSET) ||
-                       (dev->tuner_addr == client->addr)) {
-
-                       dprintk(1, "%s (tuner || addr UNSET)\n",
-                               client->driver->driver.name);
-
-                       dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
-                               client->driver->driver.name,
-                               client->addr, client->name);
-
-                       tun_setup.mode_mask = T_ANALOG_TV;
-                       tun_setup.type = dev->tuner_type;
-                       tun_setup.addr = dev->tuner_addr;
-
-                       client->driver->command(client, TUNER_SET_TYPE_ADDR,
-                               &tun_setup);
-               }
-       }
-
-       return 0;
-}
-
-static int detach_inform(struct i2c_client *client)
-{
-       struct cx23885_dev *dev = i2c_get_adapdata(client->adapter);
-
-       dprintk(1, "i2c detach [client=%s]\n", client->name);
-
-       return 0;
-}
-
-void cx23885_call_i2c_clients(struct cx23885_i2c *bus,
-                             unsigned int cmd, void *arg)
-{
-       if (bus->i2c_rc != 0)
-               return;
-
-       i2c_clients_command(&bus->i2c_adap, cmd, arg);
-}
-
 static u32 cx23885_functionality(struct i2c_adapter *adap)
 {
        return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;
@@ -343,9 +285,6 @@ static struct i2c_adapter cx23885_i2c_adap_template = {
        .owner             = THIS_MODULE,
        .id                = I2C_HW_B_CX23885,
        .algo              = &cx23885_i2c_algo_template,
-       .class             = I2C_CLASS_TV_ANALOG,
-       .client_register   = attach_inform,
-       .client_unregister = detach_inform,
 };
 
 static struct i2c_client cx23885_i2c_client_template = {
@@ -353,17 +292,17 @@ static struct i2c_client cx23885_i2c_client_template = {
 };
 
 static char *i2c_devs[128] = {
-       [0x10 >> 1]   = "tda10048",
-       [0x12 >> 1]   = "dib7000pc",
-       [ 0x1c >> 1 ] = "lgdt3303",
-       [ 0x86 >> 1 ] = "tda9887",
-       [ 0x32 >> 1 ] = "cx24227",
-       [ 0x88 >> 1 ] = "cx25837",
-       [ 0x84 >> 1 ] = "tda8295",
-       [ 0xa0 >> 1 ] = "eeprom",
-       [ 0xc0 >> 1 ] = "tuner/mt2131/tda8275",
+       [0x10 >> 1] = "tda10048",
+       [0x12 >> 1] = "dib7000pc",
+       [0x1c >> 1] = "lgdt3303",
+       [0x86 >> 1] = "tda9887",
+       [0x32 >> 1] = "cx24227",
+       [0x88 >> 1] = "cx25837",
+       [0x84 >> 1] = "tda8295",
+       [0xa0 >> 1] = "eeprom",
+       [0xc0 >> 1] = "tuner/mt2131/tda8275",
        [0xc2 >> 1] = "tuner/mt2131/tda8275/xc5000/xc3028",
-       [0xc8 >> 1]   = "tuner/xc3028L",
+       [0xc8 >> 1] = "tuner/xc3028L",
 };
 
 static void do_i2c_scan(char *name, struct i2c_client *c)
@@ -376,7 +315,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
                rc = i2c_master_recv(c, &buf, 0);
                if (rc < 0)
                        continue;
-               printk("%s: i2c scan: found device @ 0x%x  [%s]\n",
+               printk(KERN_INFO "%s: i2c scan: found device @ 0x%x  [%s]\n",
                       name, i << 1, i2c_devs[i] ? i2c_devs[i] : "???");
        }
 }
@@ -402,17 +341,21 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
 
        bus->i2c_algo.data = bus;
        bus->i2c_adap.algo_data = bus;
-       i2c_set_adapdata(&bus->i2c_adap, bus);
+       i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);
        i2c_add_adapter(&bus->i2c_adap);
 
        bus->i2c_client.adapter = &bus->i2c_adap;
 
        if (0 == bus->i2c_rc) {
-               printk("%s: i2c bus %d registered\n", dev->name, bus->nr);
-               if (i2c_scan)
+               dprintk(1, "%s: i2c bus %d registered\n", dev->name, bus->nr);
+               if (i2c_scan) {
+                       printk(KERN_INFO "%s: scan bus %d:\n",
+                                       dev->name, bus->nr);
                        do_i2c_scan(dev->name, &bus->i2c_client);
+               }
        } else
-               printk("%s: i2c bus %d register FAILED\n", dev->name, bus->nr);
+               printk(KERN_WARNING "%s: i2c bus %d register FAILED\n",
+                       dev->name, bus->nr);
 
        return bus->i2c_rc;
 }