tty: use min() in iterate_tty_write()

It simplifies the code. The "price" is we have to unify 'chunk' to be
size_t the same as 'count' is. But that change is actually correct.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230810091510.13006-24-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 846460c02c584cc589018dd9a90b905b432d5dbe..0cf1277e260b368a7704fd41ca397d3593dde48f 100644 (file)
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -964,9 +964,8 @@ int tty_write_lock(struct tty_struct *tty, bool ndelay)
 static ssize_t iterate_tty_write(struct tty_ldisc *ld, struct tty_struct *tty,
                                 struct file *file, struct iov_iter *from)
 {
-       size_t count = iov_iter_count(from);
+       size_t chunk, count = iov_iter_count(from);
        ssize_t ret, written = 0;
-       unsigned int chunk;
 
        ret = tty_write_lock(tty, file->f_flags & O_NDELAY);
        if (ret < 0)
@@ -1010,10 +1009,7 @@ static ssize_t iterate_tty_write(struct tty_ldisc *ld, struct tty_struct *tty,
 
        /* Do the write .. */
        for (;;) {
-               size_t size = count;
-
-               if (size > chunk)
-                       size = chunk;
+               size_t size = min(chunk, count);
 
                ret = -EFAULT;
                if (copy_from_iter(tty->write_buf, size, from) != size)