diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2021-05-05 11:19:16 +0200 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2021-05-19 10:56:40 +0200 |
| commit | 94cc7aeaf6c0cff0b8aeb7cb3579cee46b923560 (patch) | |
| tree | 480c01d00d7ff2fd9bd25f7becd79625a8bd771b /drivers/usb/serial/ti_usb_3410_5052.c | |
| parent | d07f6ca923ea0927a1024dfccafc5b53b61cfecc (diff) | |
| download | linux-94cc7aeaf6c0cff0b8aeb7cb3579cee46b923560.tar.gz | |
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: Jiri Slaby <jslaby@suse.cz>
[ johan: amend commit message, drop unrelated comment change ]
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/ti_usb_3410_5052.c')
| -rw-r--r-- | drivers/usb/serial/ti_usb_3410_5052.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index caa46ac23db90..2c543c1752963 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c @@ -307,7 +307,7 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port); static void ti_close(struct usb_serial_port *port); static int ti_write(struct tty_struct *tty, struct usb_serial_port *port, const unsigned char *data, int count); -static int ti_write_room(struct tty_struct *tty); +static unsigned int ti_write_room(struct tty_struct *tty); static int ti_chars_in_buffer(struct tty_struct *tty); static bool ti_tx_empty(struct usb_serial_port *port); static void ti_throttle(struct tty_struct *tty); @@ -810,18 +810,18 @@ static int ti_write(struct tty_struct *tty, struct usb_serial_port *port, } -static int ti_write_room(struct tty_struct *tty) +static unsigned int ti_write_room(struct tty_struct *tty) { struct usb_serial_port *port = tty->driver_data; struct ti_port *tport = usb_get_serial_port_data(port); - int room = 0; + unsigned int room; unsigned long flags; spin_lock_irqsave(&tport->tp_lock, flags); room = kfifo_avail(&port->write_fifo); spin_unlock_irqrestore(&tport->tp_lock, flags); - dev_dbg(&port->dev, "%s - returns %d\n", __func__, room); + dev_dbg(&port->dev, "%s - returns %u\n", __func__, room); return room; } |