summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tda9887.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-10-21 14:22:25 -0400
committerMichael Krufky <mkrufky@linuxtv.org>2007-10-21 14:22:25 -0400
commit7546de2f97f5d0ce1c30c79aa289f39ae014681b (patch)
tree521478530f37adbc5748c892ed5751d755f282f0 /linux/drivers/media/video/tda9887.c
parentaf382f57965a976afc138a6d59f64a7ee1ae4485 (diff)
downloadmediapointer-dvb-s2-7546de2f97f5d0ce1c30c79aa289f39ae014681b.tar.gz
mediapointer-dvb-s2-7546de2f97f5d0ce1c30c79aa289f39ae014681b.tar.bz2
tuner: move analog_demod_priv into struct dvb_frontend
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> --- linux/drivers/media/dvb/dvb-core/dvb_frontend.h | 1 linux/drivers/media/video/tda8290.c | 40 ++++++++++++------------ linux/drivers/media/video/tda9887.c | 14 ++++---- linux/drivers/media/video/tuner-core.c | 11 ------ linux/drivers/media/video/tuner-driver.h | 1 5 files changed, 29 insertions(+), 38 deletions(-)
Diffstat (limited to 'linux/drivers/media/video/tda9887.c')
-rw-r--r--linux/drivers/media/video/tda9887.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index 41488e4f4..394e13504 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -523,7 +523,7 @@ static int tda9887_set_config(struct tuner *t, char *buf)
static int tda9887_status(struct tuner *t)
{
- struct tda9887_priv *priv = t->priv;
+ struct tda9887_priv *priv = t->fe.analog_demod_priv;
unsigned char buf[1];
int rc;
@@ -536,7 +536,7 @@ static int tda9887_status(struct tuner *t)
static void tda9887_configure(struct tuner *t)
{
- struct tda9887_priv *priv = t->priv;
+ struct tda9887_priv *priv = t->fe.analog_demod_priv;
int rc;
memset(priv->data,0,sizeof(priv->data));
@@ -583,13 +583,13 @@ static void tda9887_configure(struct tuner *t)
static void tda9887_tuner_status(struct tuner *t)
{
- struct tda9887_priv *priv = t->priv;
+ struct tda9887_priv *priv = t->fe.analog_demod_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 tuner *t)
{
- struct tda9887_priv *priv = t->priv;
+ struct tda9887_priv *priv = t->fe.analog_demod_priv;
static int AFC_BITS_2_kHz[] = {
-12500, -37500, -62500, -97500,
-112500, -137500, -162500, -187500,
@@ -617,8 +617,8 @@ static void tda9887_set_freq(struct tuner *t, unsigned int freq)
static void tda9887_release(struct tuner *t)
{
- kfree(t->priv);
- t->priv = NULL;
+ kfree(t->fe.analog_demod_priv);
+ t->fe.analog_demod_priv = NULL;
}
static struct analog_tuner_ops tda9887_tuner_ops = {
@@ -637,7 +637,7 @@ int tda9887_tuner_init(struct tuner *t)
priv = kzalloc(sizeof(struct tda9887_priv), GFP_KERNEL);
if (priv == NULL)
return -ENOMEM;
- t->priv = priv;
+ t->fe.analog_demod_priv = priv;
priv->i2c_props.addr = t->i2c.addr;
priv->i2c_props.adap = t->i2c.adapter;