V4L/DVB (6127): tuner: kill i2c_client interface to tuner sub-drivers

To ease the conversion of the analog tuner sub-drivers into dvb_frontend
style tuner modules, we must remove the i2c_client interface.

dvb_frontend style tuner modules use i2c_transfer directly on the i2c_adapter.

This change only alters the interface between tuner.ko and the tuner
sub-drivers. The v4l2 / i2c_client interface to tuner.ko remains intact.

This patch adds inline functions tuner_i2c_xfer_send, and tuner_i2c_xfer_recv,
to replace i2c_master_send and i2c_master_recv inside the tuner sub-drivers.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Acked-by: Mike Isely <isely@pobox.com>
Acked-by: Steven Toth <stoth@hauppauge.com>
Acked-by: Patrick Boettcher <pb@linuxtv.org>
Acked-by: Jarod Wilson <jwilson@redhat.com>
Acked-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 20 insertions, 19 deletions

diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index d162bc67d445..be5387f11afb 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -29,6 +29,8 @@
                         i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
 
 struct tda9887_priv {
+        struct tuner_i2c_props i2c_props;
+
         unsigned char      data[4];
 };
 
@@ -510,19 +512,19 @@ static int tda9887_set_config(struct tuner *t, char *buf)
 
 static int tda9887_status(struct tuner *t)
 {
+        struct tda9887_priv *priv = t->priv;
         unsigned char buf[1];
         int rc;
 
         memset(buf,0,sizeof(buf));
-        if (1 != (rc = i2c_master_recv(&t->i2c,buf,1)))
+        if (1 != (rc = tuner_i2c_xfer_recv(&priv->i2c_props,buf,1)))
                 tda9887_info("i2c i/o error: rc == %d (should be 1)\n",rc);
         dump_read_message(t, buf);
         return 0;
 }
 
-static void tda9887_configure(struct i2c_client *client)
+static void tda9887_configure(struct tuner *t)
 {
-        struct tuner *t = i2c_get_clientdata(client);
         struct tda9887_priv *priv = t->priv;
         int rc;
 
@@ -557,7 +559,7 @@ static void tda9887_configure(struct i2c_client *client)
         if (tuner_debug > 1)
                 dump_write_message(t, priv->data);
 
-        if (4 != (rc = i2c_master_send(&t->i2c,priv->data,4)))
+        if (4 != (rc = tuner_i2c_xfer_send(&priv->i2c_props,priv->data,4)))
                 tda9887_info("i2c i/o error: rc == %d (should be 4)\n",rc);
 
         if (tuner_debug > 2) {
@@ -568,16 +570,15 @@ static void tda9887_configure(struct i2c_client *client)
 
 /* ---------------------------------------------------------------------- */
 
-static void tda9887_tuner_status(struct i2c_client *client)
+static void tda9887_tuner_status(struct tuner *t)
 {
-        struct tuner *t = i2c_get_clientdata(client);
         struct tda9887_priv *priv = t->priv;
         tda9887_info("Data bytes: b=0x%02x c=0x%02x e=0x%02x\n", priv->data[1], priv->data[2], priv->data[3]);
 }
 
-static int tda9887_get_afc(struct i2c_client *client)
+static int tda9887_get_afc(struct tuner *t)
 {
-        struct tuner *t = i2c_get_clientdata(client);
+        struct tda9887_priv *priv = t->priv;
         static int AFC_BITS_2_kHz[] = {
                 -12500,  -37500,  -62500,  -97500,
                 -112500, -137500, -162500, -187500,
@@ -587,26 +588,24 @@ static int tda9887_get_afc(struct i2c_client *client)
         int afc=0;
         __u8 reg = 0;
 
-        if (1 == i2c_master_recv(&t->i2c,&reg,1))
+        if (1 == tuner_i2c_xfer_recv(&priv->i2c_props,&reg,1))
                 afc = AFC_BITS_2_kHz[(reg>>1)&0x0f];
 
         return afc;
 }
 
-static void tda9887_standby(struct i2c_client *client)
+static void tda9887_standby(struct tuner *t)
 {
-        tda9887_configure(client);
+        tda9887_configure(t);
 }
 
-static void tda9887_set_freq(struct i2c_client *client, unsigned int freq)
+static void tda9887_set_freq(struct tuner *t, unsigned int freq)
 {
-        tda9887_configure(client);
+        tda9887_configure(t);
 }
 
-static void tda9887_release(struct i2c_client *c)
+static void tda9887_release(struct tuner *t)
 {
-        struct tuner *t = i2c_get_clientdata(c);
-
         kfree(t->priv);
         t->priv = NULL;
 }
@@ -620,17 +619,19 @@ static struct tuner_operations tda9887_tuner_ops = {
         .release        = tda9887_release,
 };
 
-int tda9887_tuner_init(struct i2c_client *c)
+int tda9887_tuner_init(struct tuner *t)
 {
         struct tda9887_priv *priv = NULL;
-        struct tuner *t = i2c_get_clientdata(c);
 
         priv = kzalloc(sizeof(struct tda9887_priv), GFP_KERNEL);
         if (priv == NULL)
                 return -ENOMEM;
         t->priv = priv;
 
-        strlcpy(c->name, "tda9887", sizeof(c->name));
+        priv->i2c_props.addr = t->i2c.addr;
+        priv->i2c_props.adap = t->i2c.adapter;
+
+        strlcpy(t->i2c.name, "tda9887", sizeof(t->i2c.name));
 
         tda9887_info("tda988[5/6/7] found @ 0x%x (%s)\n", t->i2c.addr,
                                                 t->i2c.driver->driver.name);