[PATCH 21/27] tty: nozomi: convert to u8 and size_t

Jiri Slaby (SUSE) posted 27 patches 2 years ago
[PATCH 21/27] tty: nozomi: convert to u8 and size_t
Posted by Jiri Slaby (SUSE) 2 years ago
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>
---
 drivers/tty/nozomi.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index b247341bd12f..e28a921c1637 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -783,11 +783,10 @@ static int receive_data(enum port_type index, struct nozomi *dc)
 			tty_insert_flip_char(&port->port, buf[0], TTY_NORMAL);
 			size = 0;
 		} else if (size < RECEIVE_BUF_MAX) {
-			size -= tty_insert_flip_string(&port->port,
-					(char *)buf, size);
+			size -= tty_insert_flip_string(&port->port, buf, size);
 		} else {
-			i = tty_insert_flip_string(&port->port,
-					(char *)buf, RECEIVE_BUF_MAX);
+			i = tty_insert_flip_string(&port->port, buf,
+						   RECEIVE_BUF_MAX);
 			size -= i;
 			offset += i;
 		}
@@ -1584,10 +1583,10 @@ static void ntty_hangup(struct tty_struct *tty)
 static ssize_t ntty_write(struct tty_struct *tty, const u8 *buffer,
 			  size_t count)
 {
-	int rval = -EINVAL;
 	struct nozomi *dc = get_dc_by_tty(tty);
 	struct port *port = tty->driver_data;
 	unsigned long flags;
+	size_t rval;
 
 	if (!dc || !port)
 		return -ENODEV;
-- 
2.43.0
Re: [PATCH 21/27] tty: nozomi: convert to u8 and size_t
Posted by Ilpo Järvinen 2 years ago
On Wed, 6 Dec 2023, Jiri Slaby (SUSE) wrote:

> 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>
> ---
>  drivers/tty/nozomi.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
> index b247341bd12f..e28a921c1637 100644
> --- a/drivers/tty/nozomi.c
> +++ b/drivers/tty/nozomi.c
> @@ -783,11 +783,10 @@ static int receive_data(enum port_type index, struct nozomi *dc)
>  			tty_insert_flip_char(&port->port, buf[0], TTY_NORMAL);
>  			size = 0;
>  		} else if (size < RECEIVE_BUF_MAX) {
> -			size -= tty_insert_flip_string(&port->port,
> -					(char *)buf, size);
> +			size -= tty_insert_flip_string(&port->port, buf, size);
>  		} else {
> -			i = tty_insert_flip_string(&port->port,
> -					(char *)buf, RECEIVE_BUF_MAX);
> +			i = tty_insert_flip_string(&port->port, buf,
> +						   RECEIVE_BUF_MAX);
>  			size -= i;
>  			offset += i;
>  		}
> @@ -1584,10 +1583,10 @@ static void ntty_hangup(struct tty_struct *tty)
>  static ssize_t ntty_write(struct tty_struct *tty, const u8 *buffer,
>  			  size_t count)
>  {
> -	int rval = -EINVAL;
>  	struct nozomi *dc = get_dc_by_tty(tty);
>  	struct port *port = tty->driver_data;
>  	unsigned long flags;
> +	size_t rval;
>  
>  	if (!dc || !port)
>  		return -ENODEV;
> 

It wouldn't hurt to mention in the commit message that -EINVAL 
initialization is unnecessary.

-- 
 i.