Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bca1b91 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

tty: Convert the USB drivers to the new icount interface 



Simple pasting job using the new ops function. Also fix a couple of devices
directly returning the internal struct (which happens at this point to match
for the fields that matter but isn't correct or futureproof)

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d281da7f

drivers/net/usb/hso.c

+16 −19
Original line number Diff line number Diff line
@@ -1645,11 +1645,11 @@ hso_wait_modem_status(struct hso_serial *serial, unsigned long arg) 
 * NB: both 1->0 and 0->1 transitions are counted except for

 *     RI where only 0->1 is counted.

 */

static int hso_get_count(struct hso_serial *serial,

			  struct serial_icounter_struct __user *icnt)

static int hso_get_count(struct tty_struct *tty,

		  struct serial_icounter_struct *icount)

{

	struct serial_icounter_struct icount;

	struct uart_icount cnow;

	struct hso_serial *serial = get_serial_by_tty(tty);

	struct hso_tiocmget  *tiocmget = serial->tiocmget;



	memset(&icount, 0, sizeof(struct serial_icounter_struct));
@@ -1660,19 +1660,19 @@ static int hso_get_count(struct hso_serial *serial, 
	memcpy(&cnow, &tiocmget->icount, sizeof(struct uart_icount));

	spin_unlock_irq(&serial->serial_lock);



	icount.cts         = cnow.cts;

	icount.dsr         = cnow.dsr;

	icount.rng         = cnow.rng;

	icount.dcd         = cnow.dcd;

	icount.rx          = cnow.rx;

	icount.tx          = cnow.tx;

	icount.frame       = cnow.frame;

	icount.overrun     = cnow.overrun;

	icount.parity      = cnow.parity;

	icount.brk         = cnow.brk;

	icount.buf_overrun = cnow.buf_overrun;

	icount->cts         = cnow.cts;

	icount->dsr         = cnow.dsr;

	icount->rng         = cnow.rng;

	icount->dcd         = cnow.dcd;

	icount->rx          = cnow.rx;

	icount->tx          = cnow.tx;

	icount->frame       = cnow.frame;

	icount->overrun     = cnow.overrun;

	icount->parity      = cnow.parity;

	icount->brk         = cnow.brk;

	icount->buf_overrun = cnow.buf_overrun;



	return copy_to_user(icnt, &icount, sizeof(icount)) ? -EFAULT : 0;

	return 0;

}
@@ -1764,10 +1764,6 @@ static int hso_serial_ioctl(struct tty_struct *tty, struct file *file, 
	case TIOCMIWAIT:

		ret = hso_wait_modem_status(serial, arg);

		break;



	case TIOCGICOUNT:

		ret = hso_get_count(serial, uarg);

		break;

	default:

		ret = -ENOIOCTLCMD;

		break;
@@ -3300,6 +3296,7 @@ static const struct tty_operations hso_serial_ops = { 
	.chars_in_buffer = hso_serial_chars_in_buffer,

	.tiocmget = hso_serial_tiocmget,

	.tiocmset = hso_serial_tiocmset,

	.get_icount = hso_get_count,

	.unthrottle = hso_unthrottle

};

drivers/usb/serial/ark3116.c

+21 −19
Original line number Diff line number Diff line
@@ -411,6 +411,26 @@ static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port) 
	return result;

}



static int ark3116_get_icount(struct tty_struct *tty,

					struct serial_icounter_struct *icount)

{

	struct usb_serial_port *port = tty->driver_data;

	struct ark3116_private *priv = usb_get_serial_port_data(port);

	struct async_icount cnow = priv->icount;

	icount->cts = cnow.cts;

	icount->dsr = cnow.dsr;

	icount->rng = cnow.rng;

	icount->dcd = cnow.dcd;

	icount->rx = cnow.rx;

	icount->tx = cnow.tx;

	icount->frame = cnow.frame;

	icount->overrun = cnow.overrun;

	icount->parity = cnow.parity;

	icount->brk = cnow.brk;

	icount->buf_overrun = cnow.buf_overrun;

	return 0;

}



static int ark3116_ioctl(struct tty_struct *tty, struct file *file,

			 unsigned int cmd, unsigned long arg)

{
@@ -460,25 +480,6 @@ static int ark3116_ioctl(struct tty_struct *tty, struct file *file, 
				return 0;

		}

		break;

	case TIOCGICOUNT: {

		struct serial_icounter_struct icount;

		struct async_icount cnow = priv->icount;

		memset(&icount, 0, sizeof(icount));

		icount.cts = cnow.cts;

		icount.dsr = cnow.dsr;

		icount.rng = cnow.rng;

		icount.dcd = cnow.dcd;

		icount.rx = cnow.rx;

		icount.tx = cnow.tx;

		icount.frame = cnow.frame;

		icount.overrun = cnow.overrun;

		icount.parity = cnow.parity;

		icount.brk = cnow.brk;

		icount.buf_overrun = cnow.buf_overrun;

		if (copy_to_user(user_arg, &icount, sizeof(icount)))

			return -EFAULT;

		return 0;

	}

	}



	return -ENOIOCTLCMD;
@@ -736,6 +737,7 @@ static struct usb_serial_driver ark3116_device = { 
	.ioctl =		ark3116_ioctl,

	.tiocmget =		ark3116_tiocmget,

	.tiocmset =		ark3116_tiocmset,

	.get_icount =		ark3116_get_icount,

	.open =			ark3116_open,

	.close =		ark3116_close,

	.break_ctl = 		ark3116_break_ctl,

drivers/usb/serial/ftdi_sio.c

+1 −0
Original line number Diff line number Diff line
@@ -2168,6 +2168,7 @@ static int ftdi_ioctl(struct tty_struct *tty, struct file *file, 
	 * - mask passed in arg for lines of interest

	 *   (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)

	 * Caller should use TIOCGICOUNT to see which one it was.

	 * (except that the driver doesn't support it !)

	 *

	 * This code is borrowed from linux/drivers/char/serial.c

	 */

drivers/usb/serial/io_edgeport.c

+27 −22
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ static void edge_break(struct tty_struct *tty, int break_state); 
static int  edge_tiocmget(struct tty_struct *tty, struct file *file);

static int  edge_tiocmset(struct tty_struct *tty, struct file *file,

					unsigned int set, unsigned int clear);

static int  edge_get_icount(struct tty_struct *tty,

				struct serial_icounter_struct *icount);

static int  edge_startup(struct usb_serial *serial);

static void edge_disconnect(struct usb_serial *serial);

static void edge_release(struct usb_serial *serial);
@@ -1624,6 +1626,31 @@ static int edge_tiocmget(struct tty_struct *tty, struct file *file) 
	return result;

}



static int edge_get_icount(struct tty_struct *tty,

				struct serial_icounter_struct *icount)

{

	struct usb_serial_port *port = tty->driver_data;

	struct edgeport_port *edge_port = usb_get_serial_port_data(port);

	struct async_icount cnow;

	cnow = edge_port->icount;



	icount->cts = cnow.cts;

	icount->dsr = cnow.dsr;

	icount->rng = cnow.rng;

	icount->dcd = cnow.dcd;

	icount->rx = cnow.rx;

	icount->tx = cnow.tx;

	icount->frame = cnow.frame;

	icount->overrun = cnow.overrun;

	icount->parity = cnow.parity;

	icount->brk = cnow.brk;

	icount->buf_overrun = cnow.buf_overrun;



	dbg("%s (%d) TIOCGICOUNT RX=%d, TX=%d",

			__func__,  port->number, icount->rx, icount->tx);

	return 0;

}



static int get_serial_info(struct edgeport_port *edge_port,

				struct serial_struct __user *retinfo)

{
@@ -1650,7 +1677,6 @@ static int get_serial_info(struct edgeport_port *edge_port, 
}







/*****************************************************************************

 * SerialIoctl

 *	this function handles any ioctl calls to the driver
@@ -1663,7 +1689,6 @@ static int edge_ioctl(struct tty_struct *tty, struct file *file, 
	struct edgeport_port *edge_port = usb_get_serial_port_data(port);

	struct async_icount cnow;

	struct async_icount cprev;

	struct serial_icounter_struct icount;



	dbg("%s - port %d, cmd = 0x%x", __func__, port->number, cmd);
@@ -1702,26 +1727,6 @@ static int edge_ioctl(struct tty_struct *tty, struct file *file, 
		/* NOTREACHED */

		break;



	case TIOCGICOUNT:

		cnow = edge_port->icount;

		memset(&icount, 0, sizeof(icount));

		icount.cts = cnow.cts;

		icount.dsr = cnow.dsr;

		icount.rng = cnow.rng;

		icount.dcd = cnow.dcd;

		icount.rx = cnow.rx;

		icount.tx = cnow.tx;

		icount.frame = cnow.frame;

		icount.overrun = cnow.overrun;

		icount.parity = cnow.parity;

		icount.brk = cnow.brk;

		icount.buf_overrun = cnow.buf_overrun;



		dbg("%s (%d) TIOCGICOUNT RX=%d, TX=%d",

				__func__,  port->number, icount.rx, icount.tx);

		if (copy_to_user((void __user *)arg, &icount, sizeof(icount)))

			return -EFAULT;

		return 0;

	}

	return -ENOIOCTLCMD;

}

drivers/usb/serial/io_tables.h

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static struct usb_serial_driver edgeport_2port_device = { 
	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.get_icount		= edge_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,
@@ -152,6 +153,7 @@ static struct usb_serial_driver edgeport_4port_device = { 
	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.get_icount		= edge_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,
@@ -181,6 +183,7 @@ static struct usb_serial_driver edgeport_8port_device = { 
	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.get_icount		= edge_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,
@@ -209,6 +212,7 @@ static struct usb_serial_driver epic_device = { 
	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.get_icount		= edge_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,