Commit 9b5aa549 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

tty: Cleanup tty_port_set_active() bool parameter

parent 75b20a2a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ static void rs_hangup(struct tty_struct *tty)
	rs_flush_buffer(tty);
	shutdown(tty, info);
	info->tport.count = 0;
	tty_port_set_active(&info->tport, 0);
	tty_port_set_active(&info->tport, false);
	info->tport.tty = NULL;
	wake_up_interruptible(&info->tport.open_wait);
}
+2 −2
Original line number Diff line number Diff line
@@ -1827,7 +1827,7 @@ static void uart_hangup(struct tty_struct *tty)
		spin_lock_irqsave(&port->lock, flags);
		port->count = 0;
		spin_unlock_irqrestore(&port->lock, flags);
		tty_port_set_active(port, 0);
		tty_port_set_active(port, false);
		tty_port_tty_set(port, NULL);
		if (uport && !uart_console(uport))
			uart_change_pm(state, UART_PM_STATE_OFF);
@@ -1945,7 +1945,7 @@ static int uart_port_activate(struct tty_port *port, struct tty_struct *tty)
	 */
	ret = uart_startup(tty, state, 0);
	if (ret > 0)
		tty_port_set_active(port, 1);
		tty_port_set_active(port, true);

	return ret;
}
+3 −3
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ static void hangup(struct tty_struct *tty)
	info->port.count = 0;
	info->port.tty = NULL;
	spin_unlock_irqrestore(&info->port.lock, flags);
	tty_port_set_active(&info->port, 0);
	tty_port_set_active(&info->port, false);
	mutex_unlock(&info->port.mutex);

	wake_up_interruptible(&info->port.open_wait);
@@ -3169,7 +3169,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,

	if (filp->f_flags & O_NONBLOCK || tty_io_error(tty)) {
		/* nonblock mode is set or port is not enabled */
		tty_port_set_active(port, 1);
		tty_port_set_active(port, true);
		return 0;
	}

@@ -3226,7 +3226,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
	port->blocked_open--;

	if (!retval)
		tty_port_set_active(port, 1);
		tty_port_set_active(port, true);

	DBGINFO(("%s block_til_ready ready, rc=%d\n", tty->driver->name, retval));
	return retval;
+5 −5
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ void tty_port_hangup(struct tty_port *port)
		set_bit(TTY_IO_ERROR, &tty->flags);
	port->tty = NULL;
	spin_unlock_irqrestore(&port->lock, flags);
	tty_port_set_active(port, 0);
	tty_port_set_active(port, false);
	tty_port_shutdown(port, tty);
	tty_kref_put(tty);
	wake_up_interruptible(&port->open_wait);
@@ -518,14 +518,14 @@ int tty_port_block_til_ready(struct tty_port *port,
	 * the port has just hung up or is in another error state.
	 */
	if (tty_io_error(tty)) {
		tty_port_set_active(port, 1);
		tty_port_set_active(port, true);
		return 0;
	}
	if (filp == NULL || (filp->f_flags & O_NONBLOCK)) {
		/* Indicate we are open */
		if (C_BAUD(tty))
			tty_port_raise_dtr_rts(port);
		tty_port_set_active(port, 1);
		tty_port_set_active(port, true);
		return 0;
	}

@@ -588,7 +588,7 @@ int tty_port_block_til_ready(struct tty_port *port,
	port->blocked_open--;
	spin_unlock_irqrestore(&port->lock, flags);
	if (retval == 0)
		tty_port_set_active(port, 1);
		tty_port_set_active(port, true);
	return retval;
}
EXPORT_SYMBOL(tty_port_block_til_ready);
@@ -695,7 +695,7 @@ void tty_port_close_end(struct tty_port *port, struct tty_struct *tty)
		wake_up_interruptible(&port->open_wait);
	}
	spin_unlock_irqrestore(&port->lock, flags);
	tty_port_set_active(port, 0);
	tty_port_set_active(port, false);
}
EXPORT_SYMBOL(tty_port_close_end);