V4L/DVB (5245): Dvb-ttpci: use i2c gate ctrl from stv0297 frontend driver

[pandora-kernel.git] / drivers / media / dvb / ttpci / av7110_v4l.c

diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index dbfd5e7..cde5d3a 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -140,17 +140,6 @@ static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
        return 0;
 }
 
-static int stv0297_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data)
-{
-       u8 buf [] = { reg, data };
-       struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 2 };
-
-       if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1))
-               return -1;
-       return 0;
-}
-
-
 static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data [4])
 {
        struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = data, .len = 4 };
@@ -193,6 +182,7 @@ static int ves1820_set_tv_freq(struct saa7146_dev *dev, u32 freq)
 
 static int stv0297_set_tv_freq(struct saa7146_dev *dev, u32 freq)
 {
+       struct av7110 *av7110 = (struct av7110*)dev->ext_priv;
        u32 div;
        u8 data[4];
 
@@ -213,8 +203,8 @@ static int stv0297_set_tv_freq(struct saa7146_dev *dev, u32 freq)
        else
                return -EINVAL;
 
-       stv0297_writereg(dev, 0x1C, 0x87, 0x78);
-       stv0297_writereg(dev, 0x1C, 0x86, 0xc8);
+       if (av7110->fe->ops.i2c_gate_ctrl)
+               av7110->fe->ops.i2c_gate_ctrl(av7110->fe, 1);
        return tuner_write(dev, 0x63, data);
 }
 
@@ -817,20 +807,20 @@ int av7110_init_v4l(struct av7110 *av7110)
                saa7146_vv_release(dev);
                return -ENODEV;
        }
-       if (saa7146_register_device(&av7110->vbi_dev, dev, "av7110", VFL_TYPE_VBI)) {
+       if (saa7146_register_device(&av7110->vbi_dev, dev, "av7110", VFL_TYPE_VBI))
                ERR(("cannot register vbi v4l2 device. skipping.\n"));
-       } else {
-               if (av7110->analog_tuner_flags)
-                       av7110->analog_tuner_flags |= ANALOG_TUNER_VBI;
-       }
        return 0;
 }
 
 int av7110_exit_v4l(struct av7110 *av7110)
 {
+       struct saa7146_dev* dev = av7110->dev;
+
        saa7146_unregister_device(&av7110->v4l_dev, av7110->dev);
-       if (av7110->analog_tuner_flags & ANALOG_TUNER_VBI)
-               saa7146_unregister_device(&av7110->vbi_dev, av7110->dev);
+       saa7146_unregister_device(&av7110->vbi_dev, av7110->dev);
+
+       saa7146_vv_release(dev);
+
        return 0;
 }