Commit f40d7815 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: io_ti: kill custom closing_wait implementation 



Kill custom closing_wait implementation and let the tty layer handle it
instead.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 263e1f9f

drivers/usb/serial/io_ti.c

+9 −48
Original line number Diff line number Diff line
@@ -521,47 +521,6 @@ static int tx_active(struct edgeport_port *port) 
	return bytes_left;

}



static void chase_port(struct edgeport_port *port, unsigned long timeout)

{

	struct tty_struct *tty = tty_port_tty_get(&port->port->port);

	struct usb_serial *serial = port->port->serial;

	wait_queue_t wait;

	unsigned long flags;



	if (!timeout)

		timeout = (HZ * EDGE_CLOSING_WAIT)/100;



	/* wait for data to drain from the buffer */

	spin_lock_irqsave(&port->ep_lock, flags);

	init_waitqueue_entry(&wait, current);

	add_wait_queue(&tty->write_wait, &wait);

	for (;;) {

		set_current_state(TASK_INTERRUPTIBLE);

		if (kfifo_len(&port->write_fifo) == 0

		|| timeout == 0 || signal_pending(current)

		|| serial->disconnected)

			/* disconnect */

			break;

		spin_unlock_irqrestore(&port->ep_lock, flags);

		timeout = schedule_timeout(timeout);

		spin_lock_irqsave(&port->ep_lock, flags);

	}

	set_current_state(TASK_RUNNING);

	remove_wait_queue(&tty->write_wait, &wait);

	spin_unlock_irqrestore(&port->ep_lock, flags);

	tty_kref_put(tty);



	/* wait for data to drain from the device */

	timeout += jiffies;

	while ((long)(jiffies - timeout) < 0 && !signal_pending(current)

						&& !serial->disconnected) {

		/* not disconnected */

		if (!tx_active(port))

			break;

		msleep(10);

	}

}



static int choose_config(struct usb_device *dev)

{

	/*
@@ -1955,8 +1914,6 @@ static void edge_close(struct usb_serial_port *port) 
	 * this flag and dump add read data */

	edge_port->close_pending = 1;



	chase_port(edge_port, (HZ * closing_wait) / 100);



	usb_kill_urb(port->read_urb);

	usb_kill_urb(port->write_urb);

	edge_port->ep_write_urb_in_use = 0;
@@ -2092,8 +2049,6 @@ static int edge_chars_in_buffer(struct tty_struct *tty) 


	if (edge_port == NULL)

		return 0;

	if (edge_port->close_pending == 1)

		return 0;



	spin_lock_irqsave(&edge_port->ep_lock, flags);

	chars = kfifo_len(&edge_port->write_fifo);
@@ -2442,10 +2397,15 @@ static int get_serial_info(struct edgeport_port *edge_port, 
				struct serial_struct __user *retinfo)

{

	struct serial_struct tmp;

	unsigned cwait;



	if (!retinfo)

		return -EFAULT;



	cwait = edge_port->port->port.closing_wait;

	if (cwait != ASYNC_CLOSING_WAIT_NONE)

		cwait = jiffies_to_msecs(closing_wait) / 10;



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



	tmp.type		= PORT_16550A;
@@ -2456,7 +2416,7 @@ static int get_serial_info(struct edgeport_port *edge_port, 
	tmp.xmit_fifo_size	= edge_port->port->bulk_out_size;

	tmp.baud_base		= 9600;

	tmp.close_delay		= 5*HZ;

	tmp.closing_wait	= closing_wait;

	tmp.closing_wait	= cwait;



	if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))

		return -EFAULT;
@@ -2511,8 +2471,7 @@ static void edge_break(struct tty_struct *tty, int break_state) 
	int status;

	int bv = 0;	/* Off */



	/* chase the port close */

	chase_port(edge_port, 0);

	tty_wait_until_sent(tty, 0);



	if (break_state == -1)

		bv = 1;	/* On */
@@ -2585,6 +2544,8 @@ static int edge_port_probe(struct usb_serial_port *port) 
		return ret;

	}



	port->port.closing_wait = msecs_to_jiffies(closing_wait * 10);



	return 0;

}