tty: srmcons: remove 'str_cr' and use string directly
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Mon, 27 Nov 2023 12:37:13 +0000 (13:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Nov 2023 19:17:06 +0000 (19:17 +0000)
'str_cr' contains a single character: \r. There is no need to declare it
as array. Instead, pass the character (as a string) to callback_puts()
directly. This ensures the string is in proper .rodata (const) section
and makes the code more obvious.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: linux-alpha@vger.kernel.org
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231127123713.14504-5-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/alpha/kernel/srmcons.c

index c6b821afbfd3a17ecaea1347fcc58d30d7eec0c4..42deea53beab2aed73353d4f2358e9236221cd8d 100644 (file)
@@ -91,7 +91,6 @@ srmcons_receive_chars(struct timer_list *t)
 static void
 srmcons_do_write(struct tty_port *port, const char *buf, int count)
 {
-       static char str_cr[1] = "\r";
        size_t c;
        srmcons_result result;
 
@@ -119,7 +118,7 @@ srmcons_do_write(struct tty_port *port, const char *buf, int count)
                }
 
                while (need_cr) {
-                       result.as_long = callback_puts(0, str_cr, 1);
+                       result.as_long = callback_puts(0, "\r", 1);
                        if (result.bits.c > 0)
                                need_cr = false;
                }