Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb865337 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: drivers/tty/, stop using tty_schedule_flip() 



commit 5f6a85158ccacc3f09744b3aafe8b11ab3b6c6f6 upstream.

Since commit a9c3f68f (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: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20211122111648.30379-2-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f52ac912

drivers/tty/cyclades.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/tty/goldfish.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/tty/moxa.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/tty/serial/lpc32xx_hs.c

+1 −1
Original line number Diff line number Diff line
@@ -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? */

drivers/tty/vt/keyboard.c

+3 −3
Original line number Diff line number Diff line
@@ -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)