Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Ladislav Michl <ladis@linux-mips.org>
Acked-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ladislav Michl and committed by
Greg Kroah-Hartman
d305394e 74bccc9b

+2 -4
+2 -3
drivers/usb/class/cdc-acm.c
··· 1337 1337 spin_lock_init(&acm->write_lock); 1338 1338 spin_lock_init(&acm->read_lock); 1339 1339 mutex_init(&acm->mutex); 1340 - acm->is_int_ep = usb_endpoint_xfer_int(epread); 1341 - if (acm->is_int_ep) { 1340 + if (usb_endpoint_xfer_int(epread)) { 1342 1341 acm->bInterval = epread->bInterval; 1343 1342 acm->in = usb_rcvintpipe(usb_dev, epread->bEndpointAddress); 1344 1343 } else { ··· 1381 1382 1382 1383 urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; 1383 1384 urb->transfer_dma = rb->dma; 1384 - if (acm->is_int_ep) 1385 + if (usb_endpoint_xfer_int(epread)) 1385 1386 usb_fill_int_urb(urb, acm->dev, acm->in, rb->base, 1386 1387 acm->readsize, 1387 1388 acm_read_bulk_callback, rb,
-1
drivers/usb/class/cdc-acm.h
··· 117 117 unsigned int ctrl_caps; /* control capabilities from the class specific header */ 118 118 unsigned int susp_count; /* number of suspended interfaces */ 119 119 unsigned int combined_interfaces:1; /* control and data collapsed */ 120 - unsigned int is_int_ep:1; /* interrupt endpoints contrary to spec used */ 121 120 unsigned int throttled:1; /* actually throttled */ 122 121 unsigned int throttle_req:1; /* throttle requested */ 123 122 u8 bInterval;