summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-06-18 19:58:44 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-04 07:56:36 -0300
commit2731d4ed77e3a58cd44584e3741c8f3e30956e9b (patch)
tree30e34778e4df64ab574e81c009c16d1a3f470e4a /drivers/media/dvb/dvb-usb
parent232b6968b1296ccd4086867c9890b6f55a65256e (diff)
downloadop-kernel-dev-2731d4ed77e3a58cd44584e3741c8f3e30956e9b.zip
op-kernel-dev-2731d4ed77e3a58cd44584e3741c8f3e30956e9b.tar.gz
[media] ec168: use DVB UDB macros
Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r--drivers/media/dvb/dvb-usb/ec168.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/media/dvb/dvb-usb/ec168.c b/drivers/media/dvb/dvb-usb/ec168.c
index 3ed80b0..c05f09c 100644
--- a/drivers/media/dvb/dvb-usb/ec168.c
+++ b/drivers/media/dvb/dvb-usb/ec168.c
@@ -271,7 +271,7 @@ static int ec168_ec100_frontend_attach(struct dvb_usb_adapter *adap)
{
pr_debug("%s:\n", __func__);
adap->fe[0] = dvb_attach(ec100_attach, &ec168_ec100_config,
- &adap->dev->i2c_adap);
+ &adap_to_d(adap)->i2c_adap);
if (adap->fe[0] == NULL)
return -ENODEV;
@@ -299,7 +299,7 @@ static int ec168_mxl5003s_tuner_attach(struct dvb_usb_adapter *adap)
{
pr_debug("%s:\n", __func__);
return dvb_attach(mxl5005s_attach, adap->fe[0],
- &adap->dev->i2c_adap,
+ &adap_to_d(adap)->i2c_adap,
&ec168_mxl5003s_config) == NULL ? -ENODEV : 0;
}
@@ -309,7 +309,7 @@ static int ec168_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
pr_debug("%s: onoff=%d\n", __func__, onoff);
if (onoff)
req.index = 0x0102;
- return ec168_ctrl_msg(adap->dev, &req);
+ return ec168_ctrl_msg(adap_to_d(adap), &req);
}
/* DVB USB Driver stuff */
@@ -333,16 +333,7 @@ static struct dvb_usb_device_properties ec168_props = {
.num_adapters = 1,
.adapter = {
{
- .stream = {
- .type = USB_BULK,
- .count = 6,
- .endpoint = 0x82,
- .u = {
- .bulk = {
- .buffersize = (32*512),
- }
- }
- },
+ .stream = DVB_USB_STREAM_BULK(0x82, 6, 32 * 512),
}
},
};
OpenPOWER on IntegriCloud