[media] dvb_usb_v2: remove num_adapters_initialized variable

We can live easily without it so remove it, make code and binary
few bytes smaller.

>From struct dvb_usb_device variable int num_adapters_initialized.

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 aecba307105e0f64bc137e4900b9e9c3c71d76dd..2bef8f4ab71aa80c008cd4942038ce2dd7bc9815 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -360,7 +360,6 @@ struct dvb_usb_device {
        struct mutex i2c_mutex;
        struct i2c_adapter i2c_adap;
 
-       int num_adapters_initialized;
        struct dvb_usb_adapter adapter[MAX_NO_OF_ADAPTER_PER_DEVICE];
 
        /* remote control */

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index 24e1f2970d8eaa7ffac995d4ec2d266913d45713..1d92d831ab27687d3a4d19a41ada895eef2dbbe1 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -270,8 +270,6 @@ static int dvb_usbv2_adapter_init(struct dvb_usb_device *d)
                        adap->dvb_adap.mfe_shared = 1;
 
                adap->dvb_adap.fe_ioctl_override = d->props->fe_ioctl_override;
-
-               d->num_adapters_initialized++;
        }
 
        return 0;
@@ -292,8 +290,6 @@ static int dvb_usbv2_adapter_exit(struct dvb_usb_device *d)
                dvb_usbv2_adapter_stream_exit(&d->adapter[i]);
        }
 
-       d->num_adapters_initialized = 0;
-
        return 0;
 }
 
@@ -551,8 +547,9 @@ int dvb_usbv2_suspend(struct usb_interface *intf, pm_message_t msg)
                cancel_delayed_work_sync(&d->rc_query_work);
 
        /* stop streaming */
-       for (i = d->num_adapters_initialized - 1; i >= 0; i--) {
-               if (d->adapter[i].active_fe != -1)
+       for (i = MAX_NO_OF_ADAPTER_PER_DEVICE - 1; i >= 0; i--) {
+               if (d->adapter[i].dvb_adap.priv &&
+                               d->adapter[i].active_fe != -1)
                        usb_urb_killv2(&d->adapter[i].stream);
        }
 
@@ -568,8 +565,9 @@ int dvb_usbv2_resume(struct usb_interface *intf)
        pr_debug("%s:\n", __func__);
 
        /* start streaming */
-       for (i = 0; i < d->num_adapters_initialized; i++) {
-               if (d->adapter[i].active_fe != -1)
+       for (i = 0; i < MAX_NO_OF_ADAPTER_PER_DEVICE; i++) {
+               if (d->adapter[i].dvb_adap.priv &&
+                               d->adapter[i].active_fe != -1)
                        usb_urb_submitv2(&d->adapter[i].stream, NULL);
        }