V4L/DVB (7261): Use the same callback argument as xc3028 and xc5000

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/dvb/frontends/tda827x.c b/drivers/media/dvb/frontends/tda827x.c
index 3190c8d0c17c8f18632d40144259058f21044acc..967ac8b28efd6cc0ac24c704dd054d9dc5542c33 100644 (file)
--- a/drivers/media/dvb/frontends/tda827x.c
+++ b/drivers/media/dvb/frontends/tda827x.c
@@ -578,8 +578,7 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
                else
                        arg = 0;
                if (priv->cfg->tuner_callback)
-                       priv->cfg->tuner_callback(priv->i2c_adap->algo_data,
-                                                 1, arg);
+                       priv->cfg->tuner_callback(priv, 1, arg);
                buf[1] = high ? 0 : 1;
                if (*priv->cfg->config == 2)
                        buf[1] = high ? 1 : 0;
@@ -587,8 +586,7 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
                break;
        case 3: /* switch with GPIO of saa713x */
                if (priv->cfg->tuner_callback)
-                       priv->cfg->tuner_callback(priv->i2c_adap->algo_data,
-                                                 0, high);
+                       priv->cfg->tuner_callback(priv, 0, high);
                break;
        }
 }

diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index ef1fd5a93b1b4ff3610c4b80da13fcc039a5f901..4817a0e046a8bd9f468193b00099857a68ac0233 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -145,7 +145,8 @@ void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value)
 int saa7134_tuner_callback(void *ptr, int command, int arg)
 {
        u8 sync_control;
-       struct saa7134_dev *dev = ptr;
+       struct i2c_algo_bit_data *i2c_algo = priv;
+       struct saa7134_dev *dev = i2c_algo->data;
 
        switch (dev->tuner_type) {
        case TUNER_PHILIPS_TDA8290: