Commit 155591d3 authored by Jiri Slaby's avatar Jiri Slaby Committed by Johan Hovold
Browse files

USB: serial: make usb_serial_driver::chars_in_buffer return uint 



tty_operations::chars_in_buffer is being switched to return uint. Do the
same for usb_serial_driver's chars_in_buffer.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
[ johan: amend commit message ]
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 94cc7aea

drivers/usb/serial/cypress_m8.c

+4 −4
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static void cypress_set_termios(struct tty_struct *tty, 
static int  cypress_tiocmget(struct tty_struct *tty);

static int  cypress_tiocmset(struct tty_struct *tty,

			unsigned int set, unsigned int clear);

static int  cypress_chars_in_buffer(struct tty_struct *tty);

static unsigned int cypress_chars_in_buffer(struct tty_struct *tty);

static void cypress_throttle(struct tty_struct *tty);

static void cypress_unthrottle(struct tty_struct *tty);

static void cypress_set_dead(struct usb_serial_port *port);
@@ -970,18 +970,18 @@ static void cypress_set_termios(struct tty_struct *tty, 




/* returns amount of data still left in soft buffer */

static int cypress_chars_in_buffer(struct tty_struct *tty)

static unsigned int cypress_chars_in_buffer(struct tty_struct *tty)

{

	struct usb_serial_port *port = tty->driver_data;

	struct cypress_private *priv = usb_get_serial_port_data(port);

	int chars = 0;

	unsigned int chars;

	unsigned long flags;



	spin_lock_irqsave(&priv->lock, flags);

	chars = kfifo_len(&priv->write_fifo);

	spin_unlock_irqrestore(&priv->lock, flags);



	dev_dbg(&port->dev, "%s - returns %d\n", __func__, chars);

	dev_dbg(&port->dev, "%s - returns %u\n", __func__, chars);

	return chars;

}

drivers/usb/serial/digi_acceleport.c

+2 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int digi_write(struct tty_struct *tty, struct usb_serial_port *port, 
		const unsigned char *buf, int count);

static void digi_write_bulk_callback(struct urb *urb);

static unsigned int digi_write_room(struct tty_struct *tty);

static int digi_chars_in_buffer(struct tty_struct *tty);

static unsigned int digi_chars_in_buffer(struct tty_struct *tty);

static int digi_open(struct tty_struct *tty, struct usb_serial_port *port);

static void digi_close(struct usb_serial_port *port);

static void digi_dtr_rts(struct usb_serial_port *port, int on);
@@ -1040,7 +1040,7 @@ static unsigned int digi_write_room(struct tty_struct *tty) 


}



static int digi_chars_in_buffer(struct tty_struct *tty)

static unsigned int digi_chars_in_buffer(struct tty_struct *tty)

{

	struct usb_serial_port *port = tty->driver_data;

	struct digi_port *priv = usb_get_serial_port_data(port);

drivers/usb/serial/generic.c

+3 −3
Original line number Diff line number Diff line
@@ -247,11 +247,11 @@ unsigned int usb_serial_generic_write_room(struct tty_struct *tty) 
	return room;

}



int usb_serial_generic_chars_in_buffer(struct tty_struct *tty)

unsigned int usb_serial_generic_chars_in_buffer(struct tty_struct *tty)

{

	struct usb_serial_port *port = tty->driver_data;

	unsigned long flags;

	int chars;

	unsigned int chars;



	if (!port->bulk_out_size)

		return 0;
@@ -260,7 +260,7 @@ int usb_serial_generic_chars_in_buffer(struct tty_struct *tty) 
	chars = kfifo_len(&port->write_fifo) + port->tx_bytes;

	spin_unlock_irqrestore(&port->lock, flags);



	dev_dbg(&port->dev, "%s - returns %d\n", __func__, chars);

	dev_dbg(&port->dev, "%s - returns %u\n", __func__, chars);

	return chars;

}

EXPORT_SYMBOL_GPL(usb_serial_generic_chars_in_buffer);

drivers/usb/serial/io_edgeport.c

+3 −3
Original line number Diff line number Diff line
@@ -1391,11 +1391,11 @@ static unsigned int edge_write_room(struct tty_struct *tty) 
 *	system,

 *	Otherwise we return a negative error number.

 *****************************************************************************/

static int edge_chars_in_buffer(struct tty_struct *tty)

static unsigned int edge_chars_in_buffer(struct tty_struct *tty)

{

	struct usb_serial_port *port = tty->driver_data;

	struct edgeport_port *edge_port = usb_get_serial_port_data(port);

	int num_chars;

	unsigned int num_chars;

	unsigned long flags;



	if (edge_port == NULL)
@@ -1413,7 +1413,7 @@ static int edge_chars_in_buffer(struct tty_struct *tty) 
						edge_port->txfifo.count;

	spin_unlock_irqrestore(&edge_port->ep_lock, flags);

	if (num_chars) {

		dev_dbg(&port->dev, "%s - returns %d\n", __func__, num_chars);

		dev_dbg(&port->dev, "%s - returns %u\n", __func__, num_chars);

	}



	return num_chars;

drivers/usb/serial/io_ti.c

+3 −3
Original line number Diff line number Diff line
@@ -2087,11 +2087,11 @@ static unsigned int edge_write_room(struct tty_struct *tty) 
	return room;

}



static int edge_chars_in_buffer(struct tty_struct *tty)

static unsigned int edge_chars_in_buffer(struct tty_struct *tty)

{

	struct usb_serial_port *port = tty->driver_data;

	struct edgeport_port *edge_port = usb_get_serial_port_data(port);

	int chars = 0;

	unsigned int chars;

	unsigned long flags;

	if (edge_port == NULL)

		return 0;
@@ -2100,7 +2100,7 @@ static int edge_chars_in_buffer(struct tty_struct *tty) 
	chars = kfifo_len(&port->write_fifo);

	spin_unlock_irqrestore(&edge_port->ep_lock, flags);



	dev_dbg(&port->dev, "%s - returns %d\n", __func__, chars);

	dev_dbg(&port->dev, "%s - returns %u\n", __func__, chars);

	return chars;

}