NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

serial: Rename uart_change_speed() to uart_change_line_settings()

Browse source 
[ Upstream commit 826736a6c7c8c3185bfb10e03c10d03d53d6cf94 ]

uart_change_speed() changes more than just speed so rename it to more
generic uart_change_line_settings().

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20230309080923.11778-6-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 8679328eb859 ("serial: Reduce spinlocked portion of uart_rs485_config()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ilpo Järvinen 2023-03-09 10:09:20 +02:00 • committed by Greg Kroah-Hartman
parent e4df8000bd
commit 147156b19c
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/tty/serial/serial_core.c
View file

@ -176,8 +176,8 @@ static void uart_port_dtr_rts(struct uart_port *uport, int raise)
} }
/* Caller holds port mutex */ /* Caller holds port mutex */
static void uart_change_speed(struct tty_struct *tty, struct uart_state *state, static void uart_change_line_settings(struct tty_struct *tty, struct uart_state *state,
const struct ktermios *old_termios) const struct ktermios *old_termios)
{ {
struct uart_port *uport = uart_port_check(state); struct uart_port *uport = uart_port_check(state);
struct ktermios *termios; struct ktermios *termios;
@ -276,7 +276,7 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
/* /*
* Initialise the hardware port settings. * Initialise the hardware port settings.
*/ */
uart_change_speed(tty, state, NULL); uart_change_line_settings(tty, state, NULL);
/* /*
* Setup the RTS and DTR signals once the * Setup the RTS and DTR signals once the
@ -992,7 +992,7 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
current->comm, current->comm,
tty_name(port->tty)); tty_name(port->tty));
} }
uart_change_speed(tty, state, NULL); uart_change_line_settings(tty, state, NULL);
} }
} else { } else {
retval = uart_startup(tty, state, 1); retval = uart_startup(tty, state, 1);
@ -1654,7 +1654,7 @@ static void uart_set_termios(struct tty_struct *tty,
goto out; goto out;
} }
uart_change_speed(tty, state, old_termios); uart_change_line_settings(tty, state, old_termios);
/* reload cflag from termios; port driver may have overridden flags */ /* reload cflag from termios; port driver may have overridden flags */
cflag = tty->termios.c_cflag; cflag = tty->termios.c_cflag;
@ -2454,7 +2454,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
ret = ops->startup(uport); ret = ops->startup(uport);
if (ret == 0) { if (ret == 0) {
if (tty) if (tty)
uart_change_speed(tty, state, NULL); uart_change_line_settings(tty, state, NULL);
spin_lock_irq(&uport->lock); spin_lock_irq(&uport->lock);
if (!(uport->rs485.flags & SER_RS485_ENABLED)) if (!(uport->rs485.flags & SER_RS485_ENABLED))
ops->set_mctrl(uport, uport->mctrl); ops->set_mctrl(uport, uport->mctrl);