Commit fff4ef17 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: make tty_operations::chars_in_buffer return uint 



tty_operations::chars_in_buffer is another hook which is expected to
return values >= 0. So make it explicit by the return type too -- use
unsigned int.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Acked-By: default avatarAnton Ivanov <anton.ivanov@cambridgegreys.com>
Acked-by: default avatarDavid Sterba <dsterba@suse.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Cc: Jens Taprogge <jens.taprogge@taprogge.org>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: David Lin <dtwlin@gmail.com>
Cc: Johan Hovold <johan@kernel.org>
Cc: Alex Elder <elder@kernel.org>
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Oliver Neukum <oneukum@suse.com>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Mathias Nyman <mathias.nyman@intel.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Link: https://lore.kernel.org/r/20210505091928.22010-27-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fa7501e5

arch/um/drivers/line.c

+2 −2
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ unsigned int line_write_room(struct tty_struct *tty) 
	return room;

}



int line_chars_in_buffer(struct tty_struct *tty)

unsigned int line_chars_in_buffer(struct tty_struct *tty)

{

	struct line *line = tty->driver_data;

	unsigned long flags;

	int ret;

	unsigned int ret;



	spin_lock_irqsave(&line->lock, flags);

	/* write_room subtracts 1 for the needed NULL, so we readd it.*/

arch/um/drivers/line.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern int line_setup(char **conf, unsigned nlines, char **def, 
extern int line_write(struct tty_struct *tty, const unsigned char *buf,

		      int len);

extern void line_set_termios(struct tty_struct *tty, struct ktermios * old);

extern int line_chars_in_buffer(struct tty_struct *tty);

extern unsigned int line_chars_in_buffer(struct tty_struct *tty);

extern void line_flush_buffer(struct tty_struct *tty);

extern void line_flush_chars(struct tty_struct *tty);

extern unsigned int line_write_room(struct tty_struct *tty);

drivers/char/pcmcia/synclink_cs.c

+3 −3
Original line number Diff line number Diff line
@@ -1637,10 +1637,10 @@ static unsigned int mgslpc_write_room(struct tty_struct *tty) 


/* Return the count of bytes in transmit buffer

 */

static int mgslpc_chars_in_buffer(struct tty_struct *tty)

static unsigned int mgslpc_chars_in_buffer(struct tty_struct *tty)

{

	MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data;

	int rc;

	unsigned int rc;



	if (debug_level >= DEBUG_LEVEL_INFO)

		printk("%s(%d):mgslpc_chars_in_buffer(%s)\n",
@@ -1655,7 +1655,7 @@ static int mgslpc_chars_in_buffer(struct tty_struct *tty) 
		rc = info->tx_count;



	if (debug_level >= DEBUG_LEVEL_INFO)

		printk("%s(%d):mgslpc_chars_in_buffer(%s)=%d\n",

		printk("%s(%d):mgslpc_chars_in_buffer(%s)=%u\n",

			 __FILE__, __LINE__, info->device_name, rc);



	return rc;

drivers/ipack/devices/ipoctal.c

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ static unsigned int ipoctal_write_room(struct tty_struct *tty) 
	return PAGE_SIZE - channel->nb_bytes;

}



static int ipoctal_chars_in_buffer(struct tty_struct *tty)

static unsigned int ipoctal_chars_in_buffer(struct tty_struct *tty)

{

	struct ipoctal_channel *channel = tty->driver_data;

drivers/isdn/capi/capi.c

+1 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ static unsigned int capinc_tty_write_room(struct tty_struct *tty) 
	return room;

}



static int capinc_tty_chars_in_buffer(struct tty_struct *tty)

static unsigned int capinc_tty_chars_in_buffer(struct tty_struct *tty)

{

	struct capiminor *mp = tty->driver_data;