serial: Rename uart_change_speed() to uart_change_line_settings()
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Thu, 9 Mar 2023 08:09:20 +0000 (10:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Mar 2023 14:00:40 +0000 (15:00 +0100)
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>
drivers/tty/serial/serial_core.c

index 7201bbc44fa72092fcc683ca60afeaf943388a90..ecdc5d9cdb530ed13edcded7c27f1f89b5a14ed3 100644 (file)
@@ -177,8 +177,8 @@ static void uart_port_dtr_rts(struct uart_port *uport, bool active)
 }
 
 /* Caller holds port mutex */
-static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,
-                             const struct ktermios *old_termios)
+static void uart_change_line_settings(struct tty_struct *tty, struct uart_state *state,
+                                     const struct ktermios *old_termios)
 {
        struct uart_port *uport = uart_port_check(state);
        struct ktermios *termios;
@@ -277,7 +277,7 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
                /*
                 * 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
@@ -993,7 +993,7 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
                                      current->comm,
                                      tty_name(port->tty));
                        }
-                       uart_change_speed(tty, state, NULL);
+                       uart_change_line_settings(tty, state, NULL);
                }
        } else {
                retval = uart_startup(tty, state, true);
@@ -1655,7 +1655,7 @@ static void uart_set_termios(struct tty_struct *tty,
                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 */
        cflag = tty->termios.c_cflag;
 
@@ -2451,7 +2451,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
                        ret = ops->startup(uport);
                        if (ret == 0) {
                                if (tty)
-                                       uart_change_speed(tty, state, NULL);
+                                       uart_change_line_settings(tty, state, NULL);
                                spin_lock_irq(&uport->lock);
                                if (!(uport->rs485.flags & SER_RS485_ENABLED))
                                        ops->set_mctrl(uport, uport->mctrl);