Skip to content

Commit

Permalink
[media] dvb_usb_v2: remove num_adapters_initialized variable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Aug 4, 2012
1 parent a0921af commit 5cd9832
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
1 change: 0 additions & 1 deletion drivers/media/dvb/dvb-usb/dvb_usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
14 changes: 6 additions & 8 deletions drivers/media/dvb/dvb-usb/dvb_usb_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand Down

0 comments on commit 5cd9832

Please sign in to comment.