diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-05 07:01:18 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-05 07:01:18 -0200 |
| commit | a4bcb33c4bd0d1cb9aa409c2cffd14c0e6c03a25 (patch) | |
| tree | aeaa5a0409f678de4e773d25848b07ac1fa2eb4c /linux | |
| parent | 0b1a2bc366328e9caa70b9f2cef95618b0d0271d (diff) | |
| download | mediapointer-dvb-s2-a4bcb33c4bd0d1cb9aa409c2cffd14c0e6c03a25.tar.gz mediapointer-dvb-s2-a4bcb33c4bd0d1cb9aa409c2cffd14c0e6c03a25.tar.bz2 | |
Use the same callback argument as xc3028 and xc5000
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/tda827x.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/frontends/tda827x.c b/linux/drivers/media/dvb/frontends/tda827x.c index d4f23f961..bb5c81a76 100644 --- a/linux/drivers/media/dvb/frontends/tda827x.c +++ b/linux/drivers/media/dvb/frontends/tda827x.c @@ -579,8 +579,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; @@ -588,8 +587,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/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 862d1f6a4..da158e4b2 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -164,7 +164,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: |