V4L/DVB (5934): dvb-ttpci/saa7146: Replace saa7146_i2c_transfer by generic i2c_transfer

Convert av7110_v4l.c to use i2c_transfer() instead of saa7146_i2c_transfer().
Make saa7146_i2c_transfer() static.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index 87afaebc0703..76cca003252f 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -129,23 +129,25 @@ static struct v4l2_input inputs[4] = {
 
 static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
 {
+        struct av7110 *av7110 = dev->ext_priv;
         u8 buf[] = { 0x00, reg, data };
         struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 3 };
 
         dprintk(4, "dev: %p\n", dev);
 
-        if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1))
+        if (1 != i2c_transfer(&av7110->i2c_adap, &msg, 1))
                 return -1;
         return 0;
 }
 
 static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data [4])
 {
+        struct av7110 *av7110 = dev->ext_priv;
         struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = data, .len = 4 };
 
         dprintk(4, "dev: %p\n", dev);
 
-        if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1))
+        if (1 != i2c_transfer(&av7110->i2c_adap, &msg, 1))
                 return -1;
         return 0;
 }