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

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

tty: 8250, remove shadow and unused variables 



The compiler complains about variables that are set, but never used:
* intX variables in exar_handle_irq
  drivers/tty/serial/8250/8250_port.c:1864:34: warning: variable ‘int3’ set but not used [-Wunused-but-set-variable]
* val variable in pci_quatech_wqopr
  drivers/tty/serial/8250/8250_pci.c:1139:10: warning: variable ‘val’ set but not used [-Wunused-but-set-variable]

And about a shadow variable:
* tmout in wait_for_xmitr is defined twice with the same type. Both of
  them are also initialized before use.

Remove all of them.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Matt Schulte <matts@commtech-fastcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 394a9e2c

drivers/tty/serial/8250/8250_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -1136,11 +1136,11 @@ static int pci_quatech_rqopr(struct uart_8250_port *port) 
static void pci_quatech_wqopr(struct uart_8250_port *port, u8 qopr)

{

	unsigned long base = port->port.iobase;

	u8 LCR, val;

	u8 LCR;



	LCR = inb(base + UART_LCR);

	outb(0xBF, base + UART_LCR);

	val = inb(base + UART_SCR);

	inb(base + UART_SCR);

	outb(qopr, base + UART_SCR);

	outb(LCR, base + UART_LCR);

}

drivers/tty/serial/8250/8250_port.c

+4 −7
Original line number Diff line number Diff line
@@ -1861,7 +1861,6 @@ static int serial8250_default_handle_irq(struct uart_port *port) 
 */

static int exar_handle_irq(struct uart_port *port)

{

	unsigned char int0, int1, int2, int3;

	unsigned int iir = serial_port_in(port, UART_IIR);

	int ret;
@@ -1869,10 +1868,10 @@ static int exar_handle_irq(struct uart_port *port) 


	if ((port->type == PORT_XR17V35X) ||

	   (port->type == PORT_XR17D15X)) {

		int0 = serial_port_in(port, 0x80);

		int1 = serial_port_in(port, 0x81);

		int2 = serial_port_in(port, 0x82);

		int3 = serial_port_in(port, 0x83);

		serial_port_in(port, 0x80);

		serial_port_in(port, 0x81);

		serial_port_in(port, 0x82);

		serial_port_in(port, 0x83);

	}



	return ret;
@@ -1994,8 +1993,6 @@ static void wait_for_xmitr(struct uart_8250_port *up, int bits) 


	/* Wait up to 1s for flow control if necessary */

	if (up->port.flags & UPF_CONS_FLOW) {

		unsigned int tmout;



		for (tmout = 1000000; tmout; tmout--) {

			unsigned int msr = serial_in(up, UART_MSR);

			up->msr_saved_flags |= msr & MSR_SAVE_FLAGS;