diff options
| author |   Johan Hovold <johan@kernel.org> | 2019-04-25 18:05:37 +0200 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2019-04-30 10:23:29 +0200 |
| commit | a8d78d9f385642696723fcb9c52c2c2805fa4249 (patch) | |
| tree | 368433304e6f08f7855b4187ba4ce6fd4f6b235a /include/linux/usb/serial.h | |
| parent | USB: serial: fix unthrottle races (diff) | |
| download | linux-dev-a8d78d9f385642696723fcb9c52c2c2805fa4249.tar.xz linux-dev-a8d78d9f385642696723fcb9c52c2c2805fa4249.zip | |
USB: serial: clean up throttle handling
Clean up the throttle implementation by dropping the redundant
throttle_req flag which was a remnant from back when there was only a
single read URB.
Also convert the throttled flag to an atomic bit flag.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'include/linux/usb/serial.h')
| -rw-r--r-- | include/linux/usb/serial.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index 1c19f77ed541..d8bdab8f3c26 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -28,6 +28,7 @@ /* USB serial flags */ #define USB_SERIAL_WRITE_BUSY 0 +#define USB_SERIAL_THROTTLED 1 /** * usb_serial_port: structure for the specific ports of a device. @@ -67,8 +68,6 @@ * @flags: usb serial port flags * @write_wait: a wait_queue_head_t used by the port. * @work: work queue entry for the line discipline waking up. - * @throttled: nonzero if the read urb is inactive to throttle the device - * @throttle_req: nonzero if the tty wants to throttle us * @dev: pointer to the serial device * * This structure is used by the usb-serial core and drivers for the specific @@ -115,8 +114,6 @@ struct usb_serial_port { unsigned long flags; wait_queue_head_t write_wait; struct work_struct work; - char throttled; - char throttle_req; unsigned long sysrq; /* sysrq timeout */ struct device dev; }; |