summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-06-18 19:44:08 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-04 07:56:35 -0300
commita1da814642fcf7b5f0e28928d809c47d7c689585 (patch)
tree4a553148bddd61cb81eb30ae92b8f0127bb3fb8c /drivers/media/dvb/dvb-usb
parent05cd62e0f858d45f46e51e2a0db679c30bc8af2d (diff)
downloadop-kernel-dev-a1da814642fcf7b5f0e28928d809c47d7c689585.zip
op-kernel-dev-a1da814642fcf7b5f0e28928d809c47d7c689585.tar.gz
[media] au6610: use DVB USB 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/au6610.c21
1 files changed, 5 insertions, 16 deletions
diff --git a/drivers/media/dvb/dvb-usb/au6610.c b/drivers/media/dvb/dvb-usb/au6610.c
index aaa0fec..05f2a86 100644
--- a/drivers/media/dvb/dvb-usb/au6610.c
+++ b/drivers/media/dvb/dvb-usb/au6610.c
@@ -137,7 +137,7 @@ static struct zl10353_config au6610_zl10353_config = {
static int au6610_zl10353_frontend_attach(struct dvb_usb_adapter *adap)
{
adap->fe[0] = dvb_attach(zl10353_attach, &au6610_zl10353_config,
- &adap->dev->i2c_adap);
+ &adap_to_d(adap)->i2c_adap);
if (adap->fe[0] == NULL)
return -ENODEV;
@@ -150,9 +150,9 @@ static struct qt1010_config au6610_qt1010_config = {
static int au6610_qt1010_tuner_attach(struct dvb_usb_adapter *adap)
{
- return dvb_attach(qt1010_attach,
- adap->fe[0], &adap->dev->i2c_adap,
- &au6610_qt1010_config) == NULL ? -ENODEV : 0;
+ return dvb_attach(qt1010_attach, adap->fe[0],
+ &adap_to_d(adap)->i2c_adap,
+ &au6610_qt1010_config) == NULL ? -ENODEV : 0;
}
static int au6610_init(struct dvb_usb_device *d)
@@ -175,18 +175,7 @@ static struct dvb_usb_device_properties au6610_props = {
.num_adapters = 1,
.adapter = {
{
- .stream = {
- .type = USB_ISOC,
- .count = 5,
- .endpoint = 0x82,
- .u = {
- .isoc = {
- .framesperurb = 40,
- .framesize = 942,
- .interval = 1,
- }
- }
- },
+ .stream = DVB_USB_STREAM_ISOC(0x82, 5, 40, 942, 1),
},
},
};
OpenPOWER on IntegriCloud