diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/quatech_usb2/quatech_usb2.c | |
parent | cdd854bc42b5e6c79bbbc40c6600d995ffe6e747 (diff) | |
parent | b12d1995f650e92f26184afd28e6cf40bf64467a (diff) |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/quatech_usb2/quatech_usb2.c')
-rw-r--r-- | drivers/staging/quatech_usb2/quatech_usb2.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c index ecd73135b319..9838ea279c5c 100644 --- a/drivers/staging/quatech_usb2/quatech_usb2.c +++ b/drivers/staging/quatech_usb2/quatech_usb2.c @@ -258,8 +258,6 @@ static int qt2_box_get_register(struct usb_serial *serial, static int qt2_box_set_register(struct usb_serial *serial, unsigned short Uart_Number, unsigned short Register_Num, unsigned short Value); -static int qt2_box_flush(struct usb_serial *serial, unsigned char uart_number, - unsigned short rcv_or_xmit); static int qt2_boxsetuart(struct usb_serial *serial, unsigned short Uart_Number, unsigned short default_divisor, unsigned char default_LCR); static int qt2_boxsethw_flowctl(struct usb_serial *serial, @@ -645,9 +643,6 @@ static void qt2_close(struct usb_serial_port *port) /* get the device private data */ port_extra = qt2_get_port_private(port); /* port private data */ - /* we don't need to force flush though the hardware, so we skip using - * qt2_box_flush() here */ - /* we can now (and only now) stop reading data */ port_extra->close_pending = true; dbg("%s(): port_extra->close_pending = true", __func__); @@ -1841,24 +1836,6 @@ static int qt2_box_set_register(struct usb_serial *serial, return result; } - -/** @brief Request the Tx or Rx buffers on the USB side be flushed - * - * Tx flush: When all the currently buffered data has been sent, send an escape - * sequence back up the data stream to us - * Rx flush: add a flag in the data stream now so we know when it's made it's - * way up to us. - */ -static int qt2_box_flush(struct usb_serial *serial, unsigned char uart_number, - unsigned short rcv_or_xmit) -{ - int result; - result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), - QT2_FLUSH_DEVICE, 0x40, rcv_or_xmit, uart_number, NULL, 0, - 300); - return result; -} - /** qt2_boxsetuart - Issue a SET_UART vendor-spcific request on the default * control pipe. If successful sets baud rate divisor and LCR value. */ @@ -1873,6 +1850,7 @@ static int qt2_boxsetuart(struct usb_serial *serial, unsigned short Uart_Number, QT2_GET_SET_UART, 0x40, default_divisor, UartNumandLCR, NULL, 0, 300); } + /** qt2_boxsethw_flowctl - Turn hardware (RTS/CTS) flow control on and off for * a hardware UART. */ |