[media] dvb-usb: refactor MFE code for individual streaming config per frontend

refactor MFE code to allow for individual streaming configuration
for each frontend

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/media/dvb/dvb-usb/au6610.c b/drivers/media/dvb/dvb-usb/au6610.c
index ebe6e1ffc319..b77994967b9b 100644
--- a/drivers/media/dvb/dvb-usb/au6610.c
+++ b/drivers/media/dvb/dvb-usb/au6610.c
@@ -140,9 +140,9 @@ 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->fe_adap[0].fe = dvb_attach(zl10353_attach, &au6610_zl10353_config,
                 &adap->dev->i2c_adap);
-        if (adap->fe[0] == NULL)
+        if (adap->fe_adap[0].fe == NULL)
                 return -ENODEV;
 
         return 0;
@@ -155,7 +155,7 @@ 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,
+                          adap->fe_adap[0].fe, &adap->dev->i2c_adap,
                           &au6610_qt1010_config) == NULL ? -ENODEV : 0;
 }
 
@@ -204,6 +204,8 @@ static struct dvb_usb_device_properties au6610_properties = {
         .num_adapters = 1,
         .adapter = {
                 {
+                .num_frontends = 1,
+                .fe = {{
                         .frontend_attach  = au6610_zl10353_frontend_attach,
                         .tuner_attach     = au6610_qt1010_tuner_attach,
 
@@ -219,6 +221,7 @@ static struct dvb_usb_device_properties au6610_properties = {
                                         }
                                 }
                         },
+                }},
                 }
         },