[31/70] mxser: remove cnt from mxser_receive_chars

Message ID 20210618061516.662-32-jslaby@suse.cz
State New
Headers show
Series
  • mxser: cleanup
Related show

Commit Message

Jiri Slaby June 18, 2021, 6:14 a.m.
After the previous ioctls removal, cnt is needed only in
mxser_receive_chars_old now. So remove it from mxser_receive_chars and
mxser_receive_chars_new and account only in mxser_receive_chars_old.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 drivers/tty/mxser.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

Patch

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 586fa3575673..d354c80083fd 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -1743,7 +1743,7 @@  static int mxser_rs_break(struct tty_struct *tty, int break_state)
 }
 
 static bool mxser_receive_chars_new(struct tty_struct *tty,
-		struct mxser_port *port, u8 status, int *cnt)
+		struct mxser_port *port, u8 status)
 {
 	enum mxser_must_hwid hwid = port->board->must_hwid;
 	u8 gdl;
@@ -1767,19 +1767,19 @@  static bool mxser_receive_chars_new(struct tty_struct *tty,
 	while (gdl--) {
 		u8 ch = inb(port->ioaddr + UART_RX);
 		tty_insert_flip_char(&port->port, ch, 0);
-		(*cnt)++;
 	}
 
 	return true;
 }
 
 static u8 mxser_receive_chars_old(struct tty_struct *tty,
-		                struct mxser_port *port, u8 status, int *cnt)
+		                struct mxser_port *port, u8 status)
 {
 	enum mxser_must_hwid hwid = port->board->must_hwid;
 	int recv_room = tty->receive_room;
 	int ignored = 0;
 	int max = 256;
+	int cnt = 0;
 	u8 ch;
 
 	do {
@@ -1814,8 +1814,8 @@  static u8 mxser_receive_chars_old(struct tty_struct *tty,
 				}
 			}
 			tty_insert_flip_char(&port->port, ch, flag);
-			(*cnt)++;
-			if (*cnt >= recv_room) {
+			cnt++;
+			if (cnt >= recv_room) {
 				if (!port->ldisc_stop_rx)
 					mxser_stoprx(tty);
 				break;
@@ -1835,13 +1835,11 @@  static u8 mxser_receive_chars_old(struct tty_struct *tty,
 static u8 mxser_receive_chars(struct tty_struct *tty,
 		struct mxser_port *port, u8 status)
 {
-	int cnt = 0;
-
 	if (tty->receive_room == 0 && !port->ldisc_stop_rx)
 		mxser_stoprx(tty);
 
-	if (!mxser_receive_chars_new(tty, port, status, &cnt))
-		status = mxser_receive_chars_old(tty, port, status, &cnt);
+	if (!mxser_receive_chars_new(tty, port, status))
+		status = mxser_receive_chars_old(tty, port, status);
 
 	tty_flip_buffer_push(&port->port);