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

Commit 98cb4ab0 authored by Jakob Østergaard Jensen's avatar Jakob Østergaard Jensen Committed by Greg Kroah-Hartman
Browse files

tty: serial: jsm_tty: fixed redundant variable issue. 



The variable "len" gets assigned once and it's value copied to
"n", which is then used for the rest of the function.

This patch fixes the unnecessary variable reassignment by using "len"
throughout the function instead.

Signed-off-by: default avatarJakob Østergaard Jensen <jakob.jensen.91@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e882f715

drivers/tty/serial/jsm/jsm_tty.c

+4 −6
Original line number Diff line number Diff line
@@ -529,7 +529,6 @@ void jsm_input(struct jsm_channel *ch) 
	int data_len;

	unsigned long lock_flags;

	int len = 0;

	int n = 0;

	int s = 0;

	int i = 0;
@@ -597,16 +596,15 @@ void jsm_input(struct jsm_channel *ch) 
	jsm_dbg(READ, &ch->ch_bd->pci_dev, "start 2\n");



	len = tty_buffer_request_room(port, data_len);

	n = len;



	/*

	 * n now contains the most amount of data we can copy,

	 * len now contains the most amount of data we can copy,

	 * bounded either by the flip buffer size or the amount

	 * of data the card actually has pending...

	 */

	while (n) {

	while (len) {

		s = ((head >= tail) ? head : RQUEUESIZE) - tail;

		s = min(s, n);

		s = min(s, len);



		if (s <= 0)

			break;
@@ -637,7 +635,7 @@ void jsm_input(struct jsm_channel *ch) 
			tty_insert_flip_string(port, ch->ch_rqueue + tail, s);

		}

		tail += s;

		n -= s;

		len -= s;

		/* Flip queue if needed */

		tail &= rmask;

	}