]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
tty: srmcons: use 'count' directly in srmcons_do_write()
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Mon, 27 Nov 2023 12:37:11 +0000 (13:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Nov 2023 19:17:06 +0000 (19:17 +0000)
Similarly to 'buf' in the previous patch, there is no need to have a
separate counter ('remaining') in srmcons_do_write(). 'count' can be
used directly which simplifies the code a bit.

Note that the type of the current count ('c') is changed from 'long' to
'size_t' so that:
1) it is prepared for the upcoming change of 'count's type, and
2) is unsigned.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Reviewed-by: 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-3-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/alpha/kernel/srmcons.c

index de896fa9829ef46c785bed3b63cf6e3fe4569664..32bc098de7da1adb8ccab8763f927f9362962570 100644 (file)
@@ -92,24 +92,24 @@ static void
 srmcons_do_write(struct tty_port *port, const char *buf, int count)
 {
        static char str_cr[1] = "\r";
-       long c, remaining = count;
+       size_t c;
        srmcons_result result;
        int need_cr;
 
-       while (remaining > 0) {
+       while (count > 0) {
                need_cr = 0;
                /* 
                 * Break it up into reasonable size chunks to allow a chance
                 * for input to get in
                 */
-               for (c = 0; c < min_t(long, 128L, remaining) && !need_cr; c++)
+               for (c = 0; c < min_t(size_t, 128U, count) && !need_cr; c++)
                        if (buf[c] == '\n')
                                need_cr = 1;
                
                while (c > 0) {
                        result.as_long = callback_puts(0, buf, c);
                        c -= result.bits.c;
-                       remaining -= result.bits.c;
+                       count -= result.bits.c;
                        buf += result.bits.c;
 
                        /*