[PATCH 25/36] tty: switch size and count types in iterate_tty_read() to size_t

From: Jiri Slaby (SUSE)
Date: Thu Aug 10 2023 - 05:17:37 EST


ld->ops->read() returns ssize_t. copy_to_iter() returns size_t. So
switch the variables ('size' and 'copied', respectively) to the
corresponding types.

This allows for use of min() in the next patch.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@xxxxxxxxxx>
---
drivers/tty/tty_io.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index e8248773e3f0..7cfa99fbbb62 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -850,10 +850,10 @@ static ssize_t iterate_tty_read(struct tty_ldisc *ld, struct tty_struct *tty,
unsigned long offset = 0;
char kernel_buf[64];
ssize_t retval = 0;
- size_t count = iov_iter_count(to);
+ size_t copied, count = iov_iter_count(to);

do {
- int size, copied;
+ ssize_t size;

size = count > sizeof(kernel_buf) ? sizeof(kernel_buf) : count;
size = ld->ops->read(tty, file, kernel_buf, size, &cookie, offset);
--
2.41.0