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

Commit 1104321a authored by Matthias Brugger's avatar Matthias Brugger Committed by Greg Kroah-Hartman
Browse files

serial: Delete dead code for CIR serial ports 



Commit e4fda3a0 ("serial: don't register CIR serial ports") adds a
check for PORT_8250_CIR to serial8250_register_8250_port(). But the code
isn't needed as the function never takes the branch when the port is CIR
serial port.

This patch deletes the dead code.

Signed-off-by: default avatarMatthias Brugger <mbrugger@suse.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51949543

drivers/tty/serial/8250/8250_core.c

+6 −17
Original line number Diff line number Diff line
@@ -1043,24 +1043,13 @@ int serial8250_register_8250_port(struct uart_8250_port *up) 
		if (up->dl_write)

			uart->dl_write = up->dl_write;



		if (uart->port.type != PORT_8250_CIR) {

		if (serial8250_isa_config != NULL)

			serial8250_isa_config(0, &uart->port,

					&uart->capabilities);



			ret = uart_add_one_port(&serial8250_reg,

						&uart->port);

		ret = uart_add_one_port(&serial8250_reg, &uart->port);

		if (ret == 0)

			ret = uart->port.line;

		} else {

			dev_info(uart->port.dev,

				"skipping CIR port at 0x%lx / 0x%llx, IRQ %d\n",

				uart->port.iobase,

				(unsigned long long)uart->port.mapbase,

				uart->port.irq);



			ret = 0;

		}

	}

	mutex_unlock(&serial_mutex);