[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, 9 insertions, 9 deletions

diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 263235e194f..735e914815e 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -23,7 +23,7 @@ int dibusb_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
         if (adap->priv != NULL) {
                 struct dibusb_state *st = adap->priv;
                 if (st->ops.fifo_ctrl != NULL)
-                        if (st->ops.fifo_ctrl(adap->fe[0],onoff)) {
+                        if (st->ops.fifo_ctrl(adap->fe_adap[0].fe,onoff)) {
                                 err("error while controlling the fifo of the demod.");
                                 return -ENODEV;
                         }
@@ -37,7 +37,7 @@ int dibusb_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, int onof
         if (adap->priv != NULL) {
                 struct dibusb_state *st = adap->priv;
                 if (st->ops.pid_ctrl != NULL)
-                        st->ops.pid_ctrl(adap->fe[0],index,pid,onoff);
+                        st->ops.pid_ctrl(adap->fe_adap[0].fe,index,pid,onoff);
         }
         return 0;
 }
@@ -48,7 +48,7 @@ int dibusb_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
         if (adap->priv != NULL) {
                 struct dibusb_state *st = adap->priv;
                 if (st->ops.pid_parse != NULL)
-                        if (st->ops.pid_parse(adap->fe[0],onoff) < 0)
+                        if (st->ops.pid_parse(adap->fe_adap[0].fe,onoff) < 0)
                                 err("could not handle pid_parser");
         }
         return 0;
@@ -254,8 +254,8 @@ int dibusb_dib3000mc_frontend_attach(struct dvb_usb_adapter *adap)
                 msleep(1000);
         }
 
-        if ((adap->fe[0] = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000P_I2C_ADDRESS,  &mod3000p_dib3000p_config)) != NULL ||
-                (adap->fe[0] = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000MC_I2C_ADDRESS, &mod3000p_dib3000p_config)) != NULL) {
+        if ((adap->fe_adap[0].fe = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000P_I2C_ADDRESS,  &mod3000p_dib3000p_config)) != NULL ||
+                (adap->fe_adap[0].fe = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000MC_I2C_ADDRESS, &mod3000p_dib3000p_config)) != NULL) {
                 if (adap->priv != NULL) {
                         struct dibusb_state *st = adap->priv;
                         st->ops.pid_parse = dib3000mc_pid_parse;
@@ -309,15 +309,15 @@ int dibusb_dib3000mc_tuner_attach(struct dvb_usb_adapter *adap)
                 }
         }
 
-        tun_i2c = dib3000mc_get_tuner_i2c_master(adap->fe[0], 1);
-        if (dvb_attach(mt2060_attach, adap->fe[0], tun_i2c, &stk3000p_mt2060_config, if1) == NULL) {
+        tun_i2c = dib3000mc_get_tuner_i2c_master(adap->fe_adap[0].fe, 1);
+        if (dvb_attach(mt2060_attach, adap->fe_adap[0].fe, tun_i2c, &stk3000p_mt2060_config, if1) == NULL) {
                 /* not found - use panasonic pll parameters */
-                if (dvb_attach(dvb_pll_attach, adap->fe[0], 0x60, tun_i2c, DVB_PLL_ENV57H1XD5) == NULL)
+                if (dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, 0x60, tun_i2c, DVB_PLL_ENV57H1XD5) == NULL)
                         return -ENOMEM;
         } else {
                 st->mt2060_present = 1;
                 /* set the correct parameters for the dib3000p */
-                dib3000mc_set_config(adap->fe[0], &stk3000p_dib3000p_config);
+                dib3000mc_set_config(adap->fe_adap[0].fe, &stk3000p_dib3000p_config);
         }
         return 0;
 }