tty: con3215: convert to u8 and size_t

Switch character types to u8 and sizes to size_t. To conform to
characters/sizes in the rest of the tty layer.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: linux-s390@vger.kernel.org
Link: https://lore.kernel.org/r/20231206073712.17776-9-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 34bc343dcfcca4f2043bfee25dd89344a9540dbf..0b0324fe4aff302bf8c7c4575df585c5ce60df28 100644 (file)
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -79,8 +79,8 @@ struct raw3215_info {
        struct ccw_device *cdev;      /* device for tty driver */
        spinlock_t *lock;             /* pointer to irq lock */
        int flags;                    /* state flags */
-       char *buffer;                 /* pointer to output buffer */
-       char *inbuf;                  /* pointer to input buffer */
+       u8 *buffer;                   /* pointer to output buffer */
+       u8 *inbuf;                    /* pointer to input buffer */
        int head;                     /* first free byte in output buffer */
        int count;                    /* number of bytes in output buffer */
        int written;                  /* number of bytes in write requests */
@@ -522,12 +522,14 @@ static unsigned int raw3215_make_room(struct raw3215_info *raw,
  *     string  without blocking.
  *     Return value is the number of bytes copied.
  */
-static unsigned int raw3215_addtext(const char *str, unsigned int length,
+static unsigned int raw3215_addtext(const u8 *str, size_t length,
                                    struct raw3215_info *raw, int opmode,
                                    unsigned int todrop)
 {
-       unsigned int c, ch, i, blanks, expanded_size = 0;
+       unsigned int i, blanks, expanded_size = 0;
        unsigned int column = raw->line_pos;
+       size_t c;
+       u8 ch;
 
        if (opmode == RAW3215_COUNT)
                todrop = 0;
@@ -558,7 +560,7 @@ static unsigned int raw3215_addtext(const char *str, unsigned int length,
                if (todrop && expanded_size < todrop)   /* Drop head data */
                        continue;
                for (i = 0; i < blanks; i++) {
-                       raw->buffer[raw->head] = (char)_ascebc[(int)ch];
+                       raw->buffer[raw->head] = _ascebc[ch];
                        raw->head = (raw->head + 1) & (RAW3215_BUFFER_SIZE - 1);
                        raw->count++;
                }
@@ -570,8 +572,8 @@ static unsigned int raw3215_addtext(const char *str, unsigned int length,
 /*
  * String write routine for 3215 devices
  */
-static void raw3215_write(struct raw3215_info *raw, const char *str,
-                         unsigned int length)
+static void raw3215_write(struct raw3215_info *raw, const u8 *str,
+                         size_t length)
 {
        unsigned int count, avail;
        unsigned long flags;
@@ -596,7 +598,7 @@ static void raw3215_write(struct raw3215_info *raw, const char *str,
 /*
  * Put character routine for 3215 devices
  */
-static void raw3215_putchar(struct raw3215_info *raw, unsigned char ch)
+static void raw3215_putchar(struct raw3215_info *raw, u8 ch)
 {
        raw3215_write(raw, &ch, 1);
 }
@@ -823,12 +825,10 @@ static struct ccw_driver raw3215_ccw_driver = {
        .int_class      = IRQIO_C15,
 };
 
-static void handle_write(struct raw3215_info *raw, const char *str, int count)
+static void handle_write(struct raw3215_info *raw, const u8 *str, size_t count)
 {
-       int i;
-
        while (count > 0) {
-               i = min_t(int, count, RAW3215_BUFFER_SIZE - 1);
+               size_t i = min_t(size_t, count, RAW3215_BUFFER_SIZE - 1);
                raw3215_write(raw, str, i);
                count -= i;
                str += i;