summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-12-31 07:03:36 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-12-31 09:58:25 -0200
commit0009e0e3e60b1e4e781e5bc5efd09b48cb397c7f (patch)
treee6a21e1a5a236f6706d4ccae792f6d2c94028fd1
parent59d3cc1975db3676da707ea7083dc7e15117409d (diff)
downloadlinux-stable-0009e0e3e60b1e4e781e5bc5efd09b48cb397c7f.tar.gz
linux-stable-0009e0e3e60b1e4e781e5bc5efd09b48cb397c7f.tar.bz2
linux-stable-0009e0e3e60b1e4e781e5bc5efd09b48cb397c7f.zip
[media] af9015: convert set_fontend to use DVBv5 parameters
Instead of using dvb_frontend_parameters struct, that were designed for a subset of the supported standards, use the DVBv5 cache information. Also, fill the supported delivery systems at dvb_frontend_ops struct. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-usb/af9015.c5
-rw-r--r--drivers/media/dvb/dvb-usb/af9015.h3
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 7b606b7834b3..7959053d54ed 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1096,8 +1096,7 @@ error:
}
/* override demod callbacks for resource locking */
-static int af9015_af9013_set_frontend(struct dvb_frontend *fe,
- struct dvb_frontend_parameters *params)
+static int af9015_af9013_set_frontend(struct dvb_frontend *fe)
{
int ret;
struct dvb_usb_adapter *adap = fe->dvb->priv;
@@ -1106,7 +1105,7 @@ static int af9015_af9013_set_frontend(struct dvb_frontend *fe,
if (mutex_lock_interruptible(&adap->dev->usb_mutex))
return -EAGAIN;
- ret = priv->set_frontend[adap->id](fe, params);
+ ret = priv->set_frontend[adap->id](fe);
mutex_unlock(&adap->dev->usb_mutex);
diff --git a/drivers/media/dvb/dvb-usb/af9015.h b/drivers/media/dvb/dvb-usb/af9015.h
index 4a126177e101..f619063fa72f 100644
--- a/drivers/media/dvb/dvb-usb/af9015.h
+++ b/drivers/media/dvb/dvb-usb/af9015.h
@@ -104,8 +104,7 @@ struct af9015_state {
u8 rc_last[4];
/* for demod callback override */
- int (*set_frontend[2]) (struct dvb_frontend *fe,
- struct dvb_frontend_parameters *params);
+ int (*set_frontend[2]) (struct dvb_frontend *fe);
int (*read_status[2]) (struct dvb_frontend *fe, fe_status_t *status);
int (*init[2]) (struct dvb_frontend *fe);
int (*sleep[2]) (struct dvb_frontend *fe);