Skip to content

Commit

Permalink
USB: ftdi_sio: clean up get_modem_status
Browse files Browse the repository at this point in the history
Use usb-serial port rather than tty as argument to get_modem_status.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed May 17, 2013
1 parent dcf0105 commit c413364
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/usb/serial/ftdi_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@ static int ftdi_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg);
static void ftdi_break_ctl(struct tty_struct *tty, int break_state);
static int ftdi_chars_in_buffer(struct tty_struct *tty);
static int ftdi_get_modem_status(struct tty_struct *tty,
static int ftdi_get_modem_status(struct usb_serial_port *port,
unsigned char status[2]);

static unsigned short int ftdi_232am_baud_base_to_divisor(int baud, int base);
Expand Down Expand Up @@ -2068,7 +2068,7 @@ static int ftdi_chars_in_buffer(struct tty_struct *tty)
goto out;

/* Check if hardware buffer is empty. */
ret = ftdi_get_modem_status(tty, buf);
ret = ftdi_get_modem_status(port, buf);
if (ret == 2) {
if (!(buf[1] & FTDI_RS_TEMT))
chars = 1;
Expand Down Expand Up @@ -2268,10 +2268,9 @@ static void ftdi_set_termios(struct tty_struct *tty,
* Returns the number of status bytes retrieved (device dependant), or
* negative error code.
*/
static int ftdi_get_modem_status(struct tty_struct *tty,
static int ftdi_get_modem_status(struct usb_serial_port *port,
unsigned char status[2])
{
struct usb_serial_port *port = tty->driver_data;
struct ftdi_private *priv = usb_get_serial_port_data(port);
unsigned char *buf;
int len;
Expand Down Expand Up @@ -2336,7 +2335,7 @@ static int ftdi_tiocmget(struct tty_struct *tty)
unsigned char buf[2];
int ret;

ret = ftdi_get_modem_status(tty, buf);
ret = ftdi_get_modem_status(port, buf);
if (ret < 0)
return ret;

Expand Down

0 comments on commit c413364

Please sign in to comment.