[media] dvb_usb_v2: remove .num_frontends

It is no longer needed because all frontends are attached as a one go.

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 56f72f6079bdbe7f42372ce98974936230d82628..c6144bb9b82da3f64ca7ac556e1653350f25ff7a 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -135,7 +135,6 @@ struct dvb_usb_adapter_properties {
        int (*fe_ioctl_override) (struct dvb_frontend *,
                        unsigned int, void *, unsigned int);
 
-       int num_frontends;
        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 bc6abfe04579712349083663d7b0204e4f4462cf..095cac5ee0b112f99e3b9278dc99be5163ff7b06 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
@@ -186,7 +186,6 @@ static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
 
 int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap)
 {
-       int i;
        int ret = dvb_register_adapter(&adap->dvb_adap, adap->dev->name,
                                       adap->dev->props.owner,
                                       &adap->dev->udev->dev,
@@ -211,10 +210,8 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap)
        adap->demux.priv             = adap;
 
        adap->demux.filternum        = 0;
-       for (i = 0; i < adap->props.num_frontends; i++) {
-               if (adap->demux.filternum < adap->max_feed_count)
-                       adap->demux.filternum = adap->max_feed_count;
-       }
+       if (adap->demux.filternum < adap->max_feed_count)
+               adap->demux.filternum = adap->max_feed_count;
        adap->demux.feednum          = adap->demux.filternum;
        adap->demux.start_feed       = dvb_usb_start_feed;
        adap->demux.stop_feed        = dvb_usb_stop_feed;