]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tty: drivers/tty/, stop using tty_schedule_flip()
authorJiri Slaby <jslaby@suse.cz>
Mon, 22 Nov 2021 11:16:46 +0000 (12:16 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 29 Jul 2022 15:05:47 +0000 (17:05 +0200)
commit 5f6a85158ccacc3f09744b3aafe8b11ab3b6c6f6 upstream.

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 latter (as it is used less), so call the former in
drivers/tty/.

Cc: Vladimir Zapolskiy <vz@mleia.com>
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20211122111648.30379-2-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/cyclades.c
drivers/tty/goldfish.c
drivers/tty/moxa.c
drivers/tty/serial/lpc32xx_hs.c
drivers/tty/vt/keyboard.c
drivers/tty/vt/vt.c

index 5e4fa920686151f94042af7b9e193d3d0486481f..3e1d03a1b8e5a68de9a507278ba9c0734f3f9a10 100644 (file)
@@ -556,7 +556,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
                }
                info->idle_stats.recv_idle = jiffies;
        }
-       tty_schedule_flip(port);
+       tty_flip_buffer_push(port);
 
        /* end of service */
        cyy_writeb(info, CyRIR, save_xir & 0x3f);
@@ -998,7 +998,7 @@ static void cyz_handle_rx(struct cyclades_port *info)
                                jiffies + 1);
 #endif
        info->idle_stats.recv_idle = jiffies;
-       tty_schedule_flip(&info->port);
+       tty_flip_buffer_push(&info->port);
 
        /* Update rx_get */
        cy_writel(&buf_ctrl->rx_get, new_rx_get);
@@ -1174,7 +1174,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                if (delta_count)
                        wake_up_interruptible(&info->port.delta_msr_wait);
                if (special_count)
-                       tty_schedule_flip(&info->port);
+                       tty_flip_buffer_push(&info->port);
        }
 }
 
index 996bd473dd03ea6f211f2338d8f95161e5f1da33..5c075c3808af1d369e55b606dd37be8b16d7a79b 100644 (file)
@@ -85,7 +85,7 @@ static irqreturn_t goldfish_tty_interrupt(int irq, void *dev_id)
        writel(count, base + GOLDFISH_TTY_DATA_LEN);
        writel(GOLDFISH_TTY_CMD_READ_BUFFER, base + GOLDFISH_TTY_CMD);
        spin_unlock_irqrestore(&qtty->lock, irq_flags);
-       tty_schedule_flip(&qtty->port);
+       tty_flip_buffer_push(&qtty->port);
        return IRQ_HANDLED;
 }
 
index 60d37b225589c25a509591f3076af353a19c752f..0a17abf484d47a4e8990b7e4461d13b61fc5e17c 100644 (file)
@@ -1397,7 +1397,7 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
                if (inited && !tty_throttled(tty) &&
                                MoxaPortRxQueue(p) > 0) { /* RX */
                        MoxaPortReadData(p);
-                       tty_schedule_flip(&p->port);
+                       tty_flip_buffer_push(&p->port);
                }
        } else {
                clear_bit(EMPTYWAIT, &p->statusflags);
@@ -1422,7 +1422,7 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
 
        if (tty && (intr & IntrBreak) && !I_IGNBRK(tty)) { /* BREAK */
                tty_insert_flip_char(&p->port, 0, TTY_BREAK);
-               tty_schedule_flip(&p->port);
+               tty_flip_buffer_push(&p->port);
        }
 
        if (intr & IntrLine)
index 7eb04ae71cc876c2fcd3f4826feb29f6d01b11cc..c74b30fa7bea0cc491888289266665c1ecc13fe8 100644 (file)
@@ -350,7 +350,7 @@ static irqreturn_t serial_lpc32xx_interrupt(int irq, void *dev_id)
                       LPC32XX_HSUART_IIR(port->membase));
                port->icount.overrun++;
                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
-               tty_schedule_flip(tport);
+               tty_flip_buffer_push(tport);
        }
 
        /* Data received? */
index 4bc6261ef3c1acb3feb6a7fb98c4a9585a58a54f..1d20abd7d3c6f1bd71a794c665303c5004984c19 100644 (file)
@@ -308,7 +308,7 @@ int kbd_rate(struct kbd_repeat *rpt)
 static void put_queue(struct vc_data *vc, int ch)
 {
        tty_insert_flip_char(&vc->port, ch, 0);
-       tty_schedule_flip(&vc->port);
+       tty_flip_buffer_push(&vc->port);
 }
 
 static void puts_queue(struct vc_data *vc, char *cp)
@@ -317,7 +317,7 @@ static void puts_queue(struct vc_data *vc, char *cp)
                tty_insert_flip_char(&vc->port, *cp, 0);
                cp++;
        }
-       tty_schedule_flip(&vc->port);
+       tty_flip_buffer_push(&vc->port);
 }
 
 static void applkey(struct vc_data *vc, int key, char mode)
@@ -562,7 +562,7 @@ static void fn_inc_console(struct vc_data *vc)
 static void fn_send_intr(struct vc_data *vc)
 {
        tty_insert_flip_char(&vc->port, 0, TTY_BREAK);
-       tty_schedule_flip(&vc->port);
+       tty_flip_buffer_push(&vc->port);
 }
 
 static void fn_scroll_forw(struct vc_data *vc)
index f7a035fa9a97a2f689dd5c4cb22c09a1fd17351b..29037322d047c2a3e495426b3430e46804802b56 100644 (file)
@@ -1484,7 +1484,7 @@ static void respond_string(const char *p, struct tty_port *port)
                tty_insert_flip_char(port, *p, 0);
                p++;
        }
-       tty_schedule_flip(port);
+       tty_flip_buffer_push(port);
 }
 
 static void cursor_report(struct vc_data *vc, struct tty_struct *tty)