serial: Delete dead code for CIR serial ports

Commit e4fda3a04275 ("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: Matthias Brugger <mbrugger@suse.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 1aab3010fbfae76e2c25cb60085f21051a1f24cf..b5def356af63b70e3ebc2e23a48da0753e41b47e 100644 (file)
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -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);
-                       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);
+               if (serial8250_isa_config != NULL)
+                       serial8250_isa_config(0, &uart->port,
+                                       &uart->capabilities);
 
-                       ret = 0;
-               }
+               ret = uart_add_one_port(&serial8250_reg, &uart->port);
+               if (ret == 0)
+                       ret = uart->port.line;
        }
        mutex_unlock(&serial_mutex);