[media] dvb_usb_v2: move (struct usb_data_stream_properties) to upper level

Move USB stream properties from frontend to adapter.
It is property of adapter.

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

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb.h b/drivers/media/dvb/dvb-usb/dvb_usb.h
index 51cb388..6ce9797 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -129,8 +129,6 @@ struct dvb_usb_adapter_fe_properties {
        int (*frontend_attach) (struct dvb_usb_adapter *);
        int (*tuner_attach)    (struct dvb_usb_adapter *);
 
-       struct usb_data_stream_properties stream;
-
        int size_of_priv;
 };
 
@@ -144,6 +142,7 @@ struct dvb_usb_adapter_properties {
 
        int num_frontends;
        struct dvb_usb_adapter_fe_properties fe[MAX_NO_OF_FE_PER_ADAP];
+       struct usb_data_stream_properties stream;
 };
 
 /**

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c b/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
index f196c0d..7fcbcc3 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
@@ -47,7 +47,7 @@ int dvb_usb_adapter_stream_init(struct dvb_usb_adapter *adap)
                if (ret < 0)
                        return ret;
        } else {
-               stream_props = adap->props.fe[0].stream;
+               stream_props = adap->props.stream;
        }
 
        /* FIXME: can be removed as set later in anyway */
@@ -139,7 +139,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
                        if (ret < 0)
                                return ret;
                } else {
-                       stream_props = adap->props.fe[adap->active_fe].stream;
+                       stream_props = adap->props.stream;
                }
 
                deb_ts("submitting all URBs\n");