Commit 5cd98320 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab

[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: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a0921af7
...@@ -360,7 +360,6 @@ struct dvb_usb_device { ...@@ -360,7 +360,6 @@ struct dvb_usb_device {
struct mutex i2c_mutex; struct mutex i2c_mutex;
struct i2c_adapter i2c_adap; struct i2c_adapter i2c_adap;
int num_adapters_initialized;
struct dvb_usb_adapter adapter[MAX_NO_OF_ADAPTER_PER_DEVICE]; struct dvb_usb_adapter adapter[MAX_NO_OF_ADAPTER_PER_DEVICE];
/* remote control */ /* remote control */
......
...@@ -270,8 +270,6 @@ static int dvb_usbv2_adapter_init(struct dvb_usb_device *d) ...@@ -270,8 +270,6 @@ static int dvb_usbv2_adapter_init(struct dvb_usb_device *d)
adap->dvb_adap.mfe_shared = 1; adap->dvb_adap.mfe_shared = 1;
adap->dvb_adap.fe_ioctl_override = d->props->fe_ioctl_override; adap->dvb_adap.fe_ioctl_override = d->props->fe_ioctl_override;
d->num_adapters_initialized++;
} }
return 0; return 0;
...@@ -292,8 +290,6 @@ static int dvb_usbv2_adapter_exit(struct dvb_usb_device *d) ...@@ -292,8 +290,6 @@ static int dvb_usbv2_adapter_exit(struct dvb_usb_device *d)
dvb_usbv2_adapter_stream_exit(&d->adapter[i]); dvb_usbv2_adapter_stream_exit(&d->adapter[i]);
} }
d->num_adapters_initialized = 0;
return 0; return 0;
} }
...@@ -551,8 +547,9 @@ int dvb_usbv2_suspend(struct usb_interface *intf, pm_message_t msg) ...@@ -551,8 +547,9 @@ int dvb_usbv2_suspend(struct usb_interface *intf, pm_message_t msg)
cancel_delayed_work_sync(&d->rc_query_work); cancel_delayed_work_sync(&d->rc_query_work);
/* stop streaming */ /* stop streaming */
for (i = d->num_adapters_initialized - 1; i >= 0; i--) { for (i = MAX_NO_OF_ADAPTER_PER_DEVICE - 1; i >= 0; i--) {
if (d->adapter[i].active_fe != -1) if (d->adapter[i].dvb_adap.priv &&
d->adapter[i].active_fe != -1)
usb_urb_killv2(&d->adapter[i].stream); usb_urb_killv2(&d->adapter[i].stream);
} }
...@@ -568,8 +565,9 @@ int dvb_usbv2_resume(struct usb_interface *intf) ...@@ -568,8 +565,9 @@ int dvb_usbv2_resume(struct usb_interface *intf)
pr_debug("%s:\n", __func__); pr_debug("%s:\n", __func__);
/* start streaming */ /* start streaming */
for (i = 0; i < d->num_adapters_initialized; i++) { for (i = 0; i < MAX_NO_OF_ADAPTER_PER_DEVICE; i++) {
if (d->adapter[i].active_fe != -1) if (d->adapter[i].dvb_adap.priv &&
d->adapter[i].active_fe != -1)
usb_urb_submitv2(&d->adapter[i].stream, NULL); usb_urb_submitv2(&d->adapter[i].stream, NULL);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment