Commit d305394e authored by Ladislav Michl's avatar Ladislav Michl Committed by Greg Kroah-Hartman

cdc-acm: remove is_int_ep from acm structure

is_int_ep is used only in acm_probe, no need to store it in device data.
Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
Acked-by: default avatarOliver Neukum <oneukum@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 74bccc9b
...@@ -1337,8 +1337,7 @@ static int acm_probe(struct usb_interface *intf, ...@@ -1337,8 +1337,7 @@ static int acm_probe(struct usb_interface *intf,
spin_lock_init(&acm->write_lock); spin_lock_init(&acm->write_lock);
spin_lock_init(&acm->read_lock); spin_lock_init(&acm->read_lock);
mutex_init(&acm->mutex); mutex_init(&acm->mutex);
acm->is_int_ep = usb_endpoint_xfer_int(epread); if (usb_endpoint_xfer_int(epread)) {
if (acm->is_int_ep) {
acm->bInterval = epread->bInterval; acm->bInterval = epread->bInterval;
acm->in = usb_rcvintpipe(usb_dev, epread->bEndpointAddress); acm->in = usb_rcvintpipe(usb_dev, epread->bEndpointAddress);
} else { } else {
...@@ -1382,7 +1381,7 @@ static int acm_probe(struct usb_interface *intf, ...@@ -1382,7 +1381,7 @@ static int acm_probe(struct usb_interface *intf,
urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
urb->transfer_dma = rb->dma; urb->transfer_dma = rb->dma;
if (acm->is_int_ep) if (usb_endpoint_xfer_int(epread))
usb_fill_int_urb(urb, acm->dev, acm->in, rb->base, usb_fill_int_urb(urb, acm->dev, acm->in, rb->base,
acm->readsize, acm->readsize,
acm_read_bulk_callback, rb, acm_read_bulk_callback, rb,
......
...@@ -117,7 +117,6 @@ struct acm { ...@@ -117,7 +117,6 @@ struct acm {
unsigned int ctrl_caps; /* control capabilities from the class specific header */ unsigned int ctrl_caps; /* control capabilities from the class specific header */
unsigned int susp_count; /* number of suspended interfaces */ unsigned int susp_count; /* number of suspended interfaces */
unsigned int combined_interfaces:1; /* control and data collapsed */ unsigned int combined_interfaces:1; /* control and data collapsed */
unsigned int is_int_ep:1; /* interrupt endpoints contrary to spec used */
unsigned int throttled:1; /* actually throttled */ unsigned int throttled:1; /* actually throttled */
unsigned int throttle_req:1; /* throttle requested */ unsigned int throttle_req:1; /* throttle requested */
u8 bInterval; u8 bInterval;
......
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