tty: use ssize_t for iterate_tty_read() returned type

[linux-2.6-block.git] / drivers / tty / tty_io.c

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 0cf1277e260b368a7704fd41ca397d3593dde48f..e8248773e3f02dc673a547cc3624f992d31ae6af 100644 (file)
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -843,13 +843,13 @@ static void tty_update_time(struct tty_struct *tty, bool mtime)
  * data or clears the cookie. The cookie may be something that the
  * ldisc maintains state for and needs to free.
  */
-static int iterate_tty_read(struct tty_ldisc *ld, struct tty_struct *tty,
-               struct file *file, struct iov_iter *to)
+static ssize_t iterate_tty_read(struct tty_ldisc *ld, struct tty_struct *tty,
+                               struct file *file, struct iov_iter *to)
 {
-       int retval = 0;
        void *cookie = NULL;
        unsigned long offset = 0;
        char kernel_buf[64];
+       ssize_t retval = 0;
        size_t count = iov_iter_count(to);
 
        do {
@@ -912,11 +912,11 @@ static int iterate_tty_read(struct tty_ldisc *ld, struct tty_struct *tty,
  */
 static ssize_t tty_read(struct kiocb *iocb, struct iov_iter *to)
 {
-       int i;
        struct file *file = iocb->ki_filp;
        struct inode *inode = file_inode(file);
        struct tty_struct *tty = file_tty(file);
        struct tty_ldisc *ld;
+       ssize_t ret;
 
        if (tty_paranoia_check(tty, inode, "tty_read"))
                return -EIO;
@@ -929,15 +929,15 @@ static ssize_t tty_read(struct kiocb *iocb, struct iov_iter *to)
        ld = tty_ldisc_ref_wait(tty);
        if (!ld)
                return hung_up_tty_read(iocb, to);
-       i = -EIO;
+       ret = -EIO;
        if (ld->ops->read)
-               i = iterate_tty_read(ld, tty, file, to);
+               ret = iterate_tty_read(ld, tty, file, to);
        tty_ldisc_deref(ld);
 
-       if (i > 0)
+       if (ret > 0)
                tty_update_time(tty, false);
 
-       return i;
+       return ret;
 }
 
 void tty_write_unlock(struct tty_struct *tty)