TTY: 68328serial, use flags from tty_port (a85dd82c) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/tty/serial/68328serial.c

+18 −21

Original line number	Original line	Diff line number	Diff line
	@@ -105,8 +105,6 @@

	/*		/*
	* This is our internal structure for each serial port's state.		* This is our internal structure for each serial port's state.
	*
	* For definitions of the flags field, see serial.h
	*/		*/
	struct m68k_serial {		struct m68k_serial {
	struct tty_port tport;		struct tty_port tport;
	@@ -115,7 +113,6 @@ struct m68k_serial {
	int baud_base;		int baud_base;
	int port;		int port;
	int irq;		int irq;
	int flags; /* defined in tty.h */
	int type; /* UART type */		int type; /* UART type */
	struct tty_struct *tty;		struct tty_struct *tty;
	int custom_divisor;		int custom_divisor;
	@@ -382,7 +379,7 @@ static int startup(struct m68k_serial * info)
	m68328_uart *uart = &uart_addr[info->line];		m68328_uart *uart = &uart_addr[info->line];
	unsigned long flags;		unsigned long flags;

	if (info->flags & ASYNC_INITIALIZED)		if (info->tport.flags & ASYNC_INITIALIZED)
	return 0;		return 0;

	if (!info->xmit_buf) {		if (!info->xmit_buf) {
	@@ -422,7 +419,7 @@ static int startup(struct m68k_serial * info)

	change_speed(info);		change_speed(info);

	info->flags \|= ASYNC_INITIALIZED;		info->tport.flags \|= ASYNC_INITIALIZED;
	local_irq_restore(flags);		local_irq_restore(flags);
	return 0;		return 0;
	}		}
	@@ -437,7 +434,7 @@ static void shutdown(struct m68k_serial * info)
	unsigned long flags;		unsigned long flags;

	uart->ustcnt = 0; /* All off! */		uart->ustcnt = 0; /* All off! */
	if (!(info->flags & ASYNC_INITIALIZED))		if (!(info->tport.flags & ASYNC_INITIALIZED))
	return;		return;

	local_irq_save(flags);		local_irq_save(flags);
	@@ -450,7 +447,7 @@ static void shutdown(struct m68k_serial * info)
	if (info->tty)		if (info->tty)
	set_bit(TTY_IO_ERROR, &info->tty->flags);		set_bit(TTY_IO_ERROR, &info->tty->flags);

	info->flags &= ~ASYNC_INITIALIZED;		info->tport.flags &= ~ASYNC_INITIALIZED;
	local_irq_restore(flags);		local_irq_restore(flags);
	}		}

	@@ -824,7 +821,7 @@ static int get_serial_info(struct m68k_serial * info,
	tmp.line = info->line;		tmp.line = info->line;
	tmp.port = info->port;		tmp.port = info->port;
	tmp.irq = info->irq;		tmp.irq = info->irq;
	tmp.flags = info->flags;		tmp.flags = info->tport.flags;
	tmp.baud_base = info->baud_base;		tmp.baud_base = info->baud_base;
	tmp.close_delay = info->tport.close_delay;		tmp.close_delay = info->tport.close_delay;
	tmp.closing_wait = info->tport.closing_wait;		tmp.closing_wait = info->tport.closing_wait;
	@@ -854,9 +851,9 @@ static int set_serial_info(struct m68k_serial * info,
	(new_serial.type != info->type) \|\|		(new_serial.type != info->type) \|\|
	(new_serial.close_delay != port->close_delay) \|\|		(new_serial.close_delay != port->close_delay) \|\|
	((new_serial.flags & ~ASYNC_USR_MASK) !=		((new_serial.flags & ~ASYNC_USR_MASK) !=
	(info->flags & ~ASYNC_USR_MASK)))		(port->flags & ~ASYNC_USR_MASK)))
	return -EPERM;		return -EPERM;
	info->flags = ((info->flags & ~ASYNC_USR_MASK) \|		port->flags = ((port->flags & ~ASYNC_USR_MASK) \|
	(new_serial.flags & ASYNC_USR_MASK));		(new_serial.flags & ASYNC_USR_MASK));
	info->custom_divisor = new_serial.custom_divisor;		info->custom_divisor = new_serial.custom_divisor;
	goto check_and_exit;		goto check_and_exit;
	@@ -871,7 +868,7 @@ static int set_serial_info(struct m68k_serial * info,
	*/		*/

	info->baud_base = new_serial.baud_base;		info->baud_base = new_serial.baud_base;
	info->flags = ((info->flags & ~ASYNC_FLAGS) \|		port->flags = ((port->flags & ~ASYNC_FLAGS) \|
	(new_serial.flags & ASYNC_FLAGS));		(new_serial.flags & ASYNC_FLAGS));
	info->type = new_serial.type;		info->type = new_serial.type;
	port->close_delay = new_serial.close_delay;		port->close_delay = new_serial.close_delay;
	@@ -1041,7 +1038,7 @@ static void rs_close(struct tty_struct tty, struct file filp)
	local_irq_restore(flags);		local_irq_restore(flags);
	return;		return;
	}		}
	info->flags \|= ASYNC_CLOSING;		port->flags \|= ASYNC_CLOSING;
	/*		/*
	* Now we wait for the transmit buffer to clear; and we notify		* Now we wait for the transmit buffer to clear; and we notify
	* the line discipline to only process XON/XOFF characters.		* the line discipline to only process XON/XOFF characters.
	@@ -1081,7 +1078,7 @@ static void rs_close(struct tty_struct tty, struct file filp)
	msleep_interruptible(jiffies_to_msecs(port->close_delay));		msleep_interruptible(jiffies_to_msecs(port->close_delay));
	wake_up_interruptible(&port->open_wait);		wake_up_interruptible(&port->open_wait);
	}		}
	info->flags &= ~(ASYNC_NORMAL_ACTIVE\|ASYNC_CLOSING);		port->flags &= ~(ASYNC_NORMAL_ACTIVE\|ASYNC_CLOSING);
	wake_up_interruptible(&port->close_wait);		wake_up_interruptible(&port->close_wait);
	local_irq_restore(flags);		local_irq_restore(flags);
	}		}
	@@ -1099,7 +1096,7 @@ void rs_hangup(struct tty_struct *tty)
	rs_flush_buffer(tty);		rs_flush_buffer(tty);
	shutdown(info);		shutdown(info);
	info->tport.count = 0;		info->tport.count = 0;
	info->flags &= ~ASYNC_NORMAL_ACTIVE;		info->tport.flags &= ~ASYNC_NORMAL_ACTIVE;
	info->tty = NULL;		info->tty = NULL;
	wake_up_interruptible(&info->tport.open_wait);		wake_up_interruptible(&info->tport.open_wait);
	}		}
	@@ -1121,10 +1118,10 @@ static int block_til_ready(struct tty_struct tty, struct file filp,
	* If the device is in the middle of being closed, then block		* If the device is in the middle of being closed, then block
	* until it's done, and then try again.		* until it's done, and then try again.
	*/		*/
	if (info->flags & ASYNC_CLOSING) {		if (port->flags & ASYNC_CLOSING) {
	interruptible_sleep_on(&port->close_wait);		interruptible_sleep_on(&port->close_wait);
	#ifdef SERIAL_DO_RESTART		#ifdef SERIAL_DO_RESTART
	if (info->flags & ASYNC_HUP_NOTIFY)		if (port->flags & ASYNC_HUP_NOTIFY)
	return -EAGAIN;		return -EAGAIN;
	else		else
	return -ERESTARTSYS;		return -ERESTARTSYS;
	@@ -1139,7 +1136,7 @@ static int block_til_ready(struct tty_struct tty, struct file filp,
	*/		*/
	if ((filp->f_flags & O_NONBLOCK) \|\|		if ((filp->f_flags & O_NONBLOCK) \|\|
	(tty->flags & (1 << TTY_IO_ERROR))) {		(tty->flags & (1 << TTY_IO_ERROR))) {
	info->flags \|= ASYNC_NORMAL_ACTIVE;		port->flags \|= ASYNC_NORMAL_ACTIVE;
	return 0;		return 0;
	}		}

	@@ -1161,9 +1158,9 @@ static int block_til_ready(struct tty_struct tty, struct file filp,
	while (1) {		while (1) {
	current->state = TASK_INTERRUPTIBLE;		current->state = TASK_INTERRUPTIBLE;
	if (tty_hung_up_p(filp) \|\|		if (tty_hung_up_p(filp) \|\|
	!(info->flags & ASYNC_INITIALIZED)) {		!(port->flags & ASYNC_INITIALIZED)) {
	#ifdef SERIAL_DO_RESTART		#ifdef SERIAL_DO_RESTART
	if (info->flags & ASYNC_HUP_NOTIFY)		if (port->flags & ASYNC_HUP_NOTIFY)
	retval = -EAGAIN;		retval = -EAGAIN;
	else		else
	retval = -ERESTARTSYS;		retval = -ERESTARTSYS;
	@@ -1172,7 +1169,7 @@ static int block_til_ready(struct tty_struct tty, struct file filp,
	#endif		#endif
	break;		break;
	}		}
	if (!(info->flags & ASYNC_CLOSING) && do_clocal)		if (!(port->flags & ASYNC_CLOSING) && do_clocal)
	break;		break;
	if (signal_pending(current)) {		if (signal_pending(current)) {
	retval = -ERESTARTSYS;		retval = -ERESTARTSYS;
	@@ -1190,7 +1187,7 @@ static int block_til_ready(struct tty_struct tty, struct file filp,

	if (retval)		if (retval)
	return retval;		return retval;
	info->flags \|= ASYNC_NORMAL_ACTIVE;		port->flags \|= ASYNC_NORMAL_ACTIVE;
	return 0;		return 0;
	}		}