@@ -133,7 +133,7 @@ static void aircable_process_read_urb(struct urb *urb)
}
if (count)
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static struct usb_serial_driver aircable_device = {
@@ -605,7 +605,7 @@ static void ark3116_process_read_urb(struct urb *urb)
}
tty_insert_flip_string_fixed_flag(&port->port, data, tty_flag,
urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static struct usb_serial_driver ark3116_device = {
@@ -269,7 +269,7 @@ static void belkin_sa_process_read_urb(struct urb *urb)
tty_insert_flip_string_fixed_flag(&port->port, data, tty_flag,
urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static void belkin_sa_set_termios(struct tty_struct *tty,
@@ -939,7 +939,7 @@ static void cp210x_process_read_urb(struct urb *urb)
} else {
tty_insert_flip_string(&port->port, ch, urb->actual_length);
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
/*
@@ -322,7 +322,7 @@ static void cyberjack_read_bulk_callback(struct urb *urb)
if (urb->actual_length) {
tty_insert_flip_string(&port->port, data, urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
spin_lock_irqsave(&priv->lock, flags);
@@ -1128,7 +1128,7 @@ static void cypress_read_int_callback(struct urb *urb)
if (bytes > i) {
tty_insert_flip_string_fixed_flag(&port->port, data + i,
tty_flag, bytes - i);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
spin_lock_irqsave(&priv->lock, flags);
@@ -1416,7 +1416,7 @@ static int digi_read_inb_callback(struct urb *urb)
if (len > 0) {
tty_insert_flip_string_fixed_flag(&port->port, data,
tty_flag, len);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
}
spin_unlock_irqrestore(&priv->dp_port_lock, flags);
@@ -428,7 +428,7 @@ static void f81232_process_read_urb(struct urb *urb)
tty_insert_flip_char(&port->port, data[i + 1], tty_flag);
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static void f81534a_process_read_urb(struct urb *urb)
@@ -469,7 +469,7 @@ static void f81534a_process_read_urb(struct urb *urb)
tty_flag, len - 2);
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static void f81232_break_ctl(struct tty_struct *tty, int break_state)
@@ -1239,7 +1239,7 @@ static void f81534_process_per_serial_block(struct usb_serial_port *port,
tty_insert_flip_char(&port->port, data[i], tty_flag);
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static void f81534_process_read_urb(struct urb *urb)
@@ -2603,7 +2603,7 @@ static void ftdi_process_read_urb(struct urb *urb)
}
if (count)
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static void ftdi_break_ctl(struct tty_struct *tty, int break_state)
@@ -245,7 +245,7 @@ static void send_to_tty(struct usb_serial_port *port,
if (actual_length) {
usb_serial_debug_data(&port->dev, __func__, actual_length, data);
tty_insert_flip_string(&port->port, data, actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
}
@@ -363,7 +363,7 @@ void usb_serial_generic_process_read_urb(struct urb *urb)
} else {
tty_insert_flip_string(&port->port, ch, urb->actual_length);
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
EXPORT_SYMBOL_GPL(usb_serial_generic_process_read_urb);
@@ -1876,7 +1876,7 @@ static void edge_tty_recv(struct usb_serial_port *port, unsigned char *data,
data += cnt;
length -= cnt;
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
@@ -1794,7 +1794,7 @@ static void edge_tty_recv(struct usb_serial_port *port, unsigned char *data,
if (queued < length)
dev_err(&port->dev, "%s - dropping data, %d bytes lost\n",
__func__, length - queued);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static void edge_bulk_out_callback(struct urb *urb)
@@ -372,7 +372,7 @@ static void ir_process_read_urb(struct urb *urb)
return;
tty_insert_flip_string(&port->port, data + 1, urb->actual_length - 1);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static void ir_set_termios(struct tty_struct *tty,
@@ -590,7 +590,7 @@ static void read_buf_callback(struct urb *urb)
if (urb->actual_length) {
tty_insert_flip_string(&port->port, data, urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
iuu_led_activity_on(urb);
}
@@ -810,7 +810,7 @@ static void usa26_indat_callback(struct urb *urb)
flag);
}
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
/* Resubmit urb so we continue receiving */
@@ -936,7 +936,7 @@ static void usa28_indat_callback(struct urb *urb)
if (urb->actual_length) {
tty_insert_flip_string(&port->port, data,
urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
/* Resubmit urb so we continue receiving */
@@ -1154,7 +1154,7 @@ static void usa49_indat_callback(struct urb *urb)
flag);
}
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
/* Resubmit urb so we continue receiving */
@@ -1225,7 +1225,7 @@ static void usa49wg_indat_callback(struct urb *urb)
i += 2;
}
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
/* Resubmit urb so we continue receiving */
@@ -1301,7 +1301,7 @@ static void usa90_indat_callback(struct urb *urb)
}
}
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
/* Resubmit urb so we continue receiving */
@@ -190,7 +190,7 @@ static void keyspan_pda_rx_interrupt(struct urb *urb)
if (len < 2)
break;
tty_insert_flip_string(&port->port, data + 1, len - 1);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
break;
case 1:
/* status interrupt */
@@ -388,7 +388,7 @@ static void klsi_105_process_read_urb(struct urb *urb)
}
tty_insert_flip_string(&port->port, data + KLSI_HDR_LEN, len);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static void klsi_105_set_termios(struct tty_struct *tty,
@@ -276,7 +276,7 @@ static void kobil_read_int_callback(struct urb *urb)
usb_serial_debug_data(&port->dev, __func__, urb->actual_length,
data);
tty_insert_flip_string(&port->port, data, urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
@@ -538,7 +538,7 @@ static void mct_u232_read_int_callback(struct urb *urb)
if (urb->actual_length) {
tty_insert_flip_string(&port->port, data,
urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
goto exit;
}
@@ -141,7 +141,7 @@ static void metrousb_read_int_callback(struct urb *urb)
tty_insert_flip_string(&port->port, data, urb->actual_length);
/* Force the data to the tty layer. */
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
/* Set any port variables. */
@@ -782,7 +782,7 @@ static void mos7720_bulk_in_callback(struct urb *urb)
if (urb->actual_length) {
tty_insert_flip_string(&port->port, data, urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
if (port->read_urb->status != -EINPROGRESS) {
@@ -451,7 +451,7 @@ static void mos7840_bulk_in_callback(struct urb *urb)
if (urb->actual_length) {
struct tty_port *tport = &mos7840_port->port->port;
tty_insert_flip_string(tport, data, urb->actual_length);
- tty_flip_buffer_push(tport);
+ tty_schedule_flip(tport);
port->icount.rx += urb->actual_length;
dev_dbg(&port->dev, "icount.rx is %d:\n", port->icount.rx);
}
@@ -329,7 +329,7 @@ static void mxuport_process_read_urb_data(struct usb_serial_port *port,
} else {
tty_insert_flip_string(&port->port, data, size);
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static void mxuport_msr_event(struct usb_serial_port *port, u8 buf[4])
@@ -52,7 +52,7 @@ static void navman_read_int_callback(struct urb *urb)
if (urb->actual_length) {
tty_insert_flip_string(&port->port, data, urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
exit:
@@ -149,7 +149,7 @@ static void omninet_process_read_urb(struct urb *urb)
data_len = min_t(size_t, urb->actual_length - OMNINET_HEADERLEN,
hdr->oh_len);
tty_insert_flip_string(&port->port, data, data_len);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static int omninet_prepare_write_buffer(struct usb_serial_port *port,
@@ -51,7 +51,7 @@ static void opticon_process_data_packet(struct usb_serial_port *port,
const unsigned char *buf, size_t len)
{
tty_insert_flip_string(&port->port, buf, len);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static void opticon_process_status_packet(struct usb_serial_port *port,
@@ -780,7 +780,7 @@ static void oti6858_read_bulk_callback(struct urb *urb)
if (urb->actual_length > 0) {
tty_insert_flip_string(&port->port, data, urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
/* schedule the interrupt urb */
@@ -1211,7 +1211,7 @@ static void pl2303_process_read_urb(struct urb *urb)
urb->actual_length);
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static struct usb_serial_driver pl2303_device = {
@@ -521,7 +521,7 @@ static void qt2_process_read_urb(struct urb *urb)
__func__);
break;
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
newport = *(ch + 3);
@@ -560,7 +560,7 @@ static void qt2_process_read_urb(struct urb *urb)
tty_insert_flip_char(&port->port, *ch, TTY_NORMAL);
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static void qt2_write_bulk_callback(struct urb *urb)
@@ -217,7 +217,7 @@ static void safe_process_read_urb(struct urb *urb)
length = actual_length;
out:
tty_insert_flip_string(&port->port, data, length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static int safe_prepare_write_buffer(struct usb_serial_port *port,
@@ -538,7 +538,7 @@ static void sierra_indat_callback(struct urb *urb)
if (urb->actual_length) {
tty_insert_flip_string(&port->port, data,
urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
usb_serial_debug_data(&port->dev, __func__,
urb->actual_length, data);
@@ -509,7 +509,7 @@ static void ssu100_process_read_urb(struct urb *urb)
tty_insert_flip_string_fixed_flag(&port->port, ch, flag, len);
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
}
static struct usb_serial_driver ssu100_device = {
@@ -68,7 +68,7 @@ static void symbol_int_callback(struct urb *urb)
if (data_length > (urb->actual_length - 1))
data_length = urb->actual_length - 1;
tty_insert_flip_string(&port->port, &data[1], data_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
} else {
dev_dbg(&port->dev, "%s - short packet\n", __func__);
}
@@ -1275,7 +1275,7 @@ static void ti_recv(struct usb_serial_port *port, unsigned char *data,
if (cnt == 0)
break;
}
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
data += cnt;
length -= cnt;
} while (length > 0);
@@ -233,7 +233,7 @@ static void usb_wwan_indat_callback(struct urb *urb)
if (urb->actual_length) {
tty_insert_flip_string(&port->port, data,
urb->actual_length);
- tty_flip_buffer_push(&port->port);
+ tty_schedule_flip(&port->port);
} else
dev_dbg(dev, "%s: empty read urb received\n", __func__);
}
Since commit a9c3f68f3cd8d (tty: Fix low_latency BUG) in 2014, tty_flip_buffer_push() is only a wrapper to tty_schedule_flip(). We are going to remove the former, so call the latter directly in drivers/usb/serial/. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Johan Hovold <johan@kernel.org> Cc: linux-usb@vger.kernel.org --- drivers/usb/serial/aircable.c | 2 +- drivers/usb/serial/ark3116.c | 2 +- drivers/usb/serial/belkin_sa.c | 2 +- drivers/usb/serial/cp210x.c | 2 +- drivers/usb/serial/cyberjack.c | 2 +- drivers/usb/serial/cypress_m8.c | 2 +- drivers/usb/serial/digi_acceleport.c | 2 +- drivers/usb/serial/f81232.c | 4 ++-- drivers/usb/serial/f81534.c | 2 +- drivers/usb/serial/ftdi_sio.c | 2 +- drivers/usb/serial/garmin_gps.c | 2 +- drivers/usb/serial/generic.c | 2 +- drivers/usb/serial/io_edgeport.c | 2 +- drivers/usb/serial/io_ti.c | 2 +- drivers/usb/serial/ir-usb.c | 2 +- drivers/usb/serial/iuu_phoenix.c | 2 +- drivers/usb/serial/keyspan.c | 10 +++++----- drivers/usb/serial/keyspan_pda.c | 2 +- drivers/usb/serial/kl5kusb105.c | 2 +- drivers/usb/serial/kobil_sct.c | 2 +- drivers/usb/serial/mct_u232.c | 2 +- drivers/usb/serial/metro-usb.c | 2 +- drivers/usb/serial/mos7720.c | 2 +- drivers/usb/serial/mos7840.c | 2 +- drivers/usb/serial/mxuport.c | 2 +- drivers/usb/serial/navman.c | 2 +- drivers/usb/serial/omninet.c | 2 +- drivers/usb/serial/opticon.c | 2 +- drivers/usb/serial/oti6858.c | 2 +- drivers/usb/serial/pl2303.c | 2 +- drivers/usb/serial/quatech2.c | 4 ++-- drivers/usb/serial/safe_serial.c | 2 +- drivers/usb/serial/sierra.c | 2 +- drivers/usb/serial/ssu100.c | 2 +- drivers/usb/serial/symbolserial.c | 2 +- drivers/usb/serial/ti_usb_3410_5052.c | 2 +- drivers/usb/serial/usb_wwan.c | 2 +- 37 files changed, 43 insertions(+), 43 deletions(-)