Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206063
b: refs/heads/master
c: 3457912
h: refs/heads/master
i:
  206061: 85a0c7c
  206059: d05b3b5
  206055: eff257d
  206047: 1c48a86
v: v3
  • Loading branch information
Javier Martinez Canillas authored and Greg Kroah-Hartman committed Aug 3, 2010
1 parent 3545b18 commit d76c4b5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 24 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9092de6df330265f0cbfca496386d329ec8c2aa5
refs/heads/master: 3457912e0e4d42297aa37fe27a331516b684e91c
24 changes: 1 addition & 23 deletions trunk/drivers/staging/quatech_usb2/quatech_usb2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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__);
Expand Down Expand Up @@ -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.
*/
Expand All @@ -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.
*/
Expand Down

0 comments on commit d76c4b5

Please sign in to comment.