Commit 94cc7aea authored by Jiri Slaby's avatar Jiri Slaby Committed by Johan Hovold
Browse files

USB: serial: make usb_serial_driver::write_room return uint 



Line disciplines expect a positive value or zero returned from
tty->ops->write_room (invoked by tty_write_room). Both of them are being
updated to return an unsigned int. Switch also
usb_serial_driver::write_room and all its users.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
[ johan: amend commit message, drop unrelated comment change ]
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent d07f6ca9

drivers/usb/serial/cyberjack.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static int cyberjack_open(struct tty_struct *tty, 
static void cyberjack_close(struct usb_serial_port *port);

static int cyberjack_write(struct tty_struct *tty,

	struct usb_serial_port *port, const unsigned char *buf, int count);

static int cyberjack_write_room(struct tty_struct *tty);

static unsigned int cyberjack_write_room(struct tty_struct *tty);

static void cyberjack_read_int_callback(struct urb *urb);

static void cyberjack_read_bulk_callback(struct urb *urb);

static void cyberjack_write_bulk_callback(struct urb *urb);
@@ -240,7 +240,7 @@ static int cyberjack_write(struct tty_struct *tty, 
	return count;

}



static int cyberjack_write_room(struct tty_struct *tty)

static unsigned int cyberjack_write_room(struct tty_struct *tty)

{

	/* FIXME: .... */

	return CYBERJACK_LOCAL_BUF_SIZE;

drivers/usb/serial/cypress_m8.c

+4 −4
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void cypress_dtr_rts(struct usb_serial_port *port, int on); 
static int  cypress_write(struct tty_struct *tty, struct usb_serial_port *port,

			const unsigned char *buf, int count);

static void cypress_send(struct usb_serial_port *port);

static int  cypress_write_room(struct tty_struct *tty);

static unsigned int cypress_write_room(struct tty_struct *tty);

static void cypress_earthmate_init_termios(struct tty_struct *tty);

static void cypress_set_termios(struct tty_struct *tty,

			struct usb_serial_port *port, struct ktermios *old);
@@ -789,18 +789,18 @@ static void cypress_send(struct usb_serial_port *port) 




/* returns how much space is available in the soft buffer */

static int cypress_write_room(struct tty_struct *tty)

static unsigned int cypress_write_room(struct tty_struct *tty)

{

	struct usb_serial_port *port = tty->driver_data;

	struct cypress_private *priv = usb_get_serial_port_data(port);

	int room = 0;

	unsigned int room;

	unsigned long flags;



	spin_lock_irqsave(&priv->lock, flags);

	room = kfifo_avail(&priv->write_fifo);

	spin_unlock_irqrestore(&priv->lock, flags);



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

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

	return room;

}

drivers/usb/serial/digi_acceleport.c

+4 −4
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int digi_tiocmset(struct tty_struct *tty, unsigned int set, 
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 int digi_write_room(struct tty_struct *tty);

static unsigned int digi_write_room(struct tty_struct *tty);

static 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);
@@ -1020,11 +1020,11 @@ static void digi_write_bulk_callback(struct urb *urb) 
		tty_port_tty_wakeup(&port->port);

}



static int digi_write_room(struct tty_struct *tty)

static unsigned int digi_write_room(struct tty_struct *tty)

{

	struct usb_serial_port *port = tty->driver_data;

	struct digi_port *priv = usb_get_serial_port_data(port);

	int room;

	unsigned int room;

	unsigned long flags = 0;



	spin_lock_irqsave(&priv->dp_port_lock, flags);
@@ -1035,7 +1035,7 @@ static int digi_write_room(struct tty_struct *tty) 
		room = port->bulk_out_size - 2 - priv->dp_out_buf_len;



	spin_unlock_irqrestore(&priv->dp_port_lock, flags);

	dev_dbg(&port->dev, "digi_write_room: port=%d, room=%d\n", priv->dp_port_num, room);

	dev_dbg(&port->dev, "digi_write_room: port=%d, room=%u\n", priv->dp_port_num, room);

	return room;



}

drivers/usb/serial/garmin_gps.c

+1 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,7 @@ static int garmin_write(struct tty_struct *tty, struct usb_serial_port *port, 
}





static int garmin_write_room(struct tty_struct *tty)

static unsigned int garmin_write_room(struct tty_struct *tty)

{

	struct usb_serial_port *port = tty->driver_data;

	/*

drivers/usb/serial/generic.c

+3 −3
Original line number Diff line number Diff line
@@ -230,11 +230,11 @@ int usb_serial_generic_write(struct tty_struct *tty, 
}

EXPORT_SYMBOL_GPL(usb_serial_generic_write);



int usb_serial_generic_write_room(struct tty_struct *tty)

unsigned int usb_serial_generic_write_room(struct tty_struct *tty)

{

	struct usb_serial_port *port = tty->driver_data;

	unsigned long flags;

	int room;

	unsigned int room;



	if (!port->bulk_out_size)

		return 0;
@@ -243,7 +243,7 @@ int usb_serial_generic_write_room(struct tty_struct *tty) 
	room = kfifo_avail(&port->write_fifo);

	spin_unlock_irqrestore(&port->lock, flags);



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

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

	return room;

}