[PATCH] serial: Delete dead code for CIR serial ports

[PATCH] serial: Delete dead code for CIR serial ports

[Matthias Brugger]

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>
---
 drivers/tty/serial/8250/8250_core.c | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 1aab3010fbfa..c66196c308d0 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -1043,24 +1043,14 @@ 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);
 
-- 
2.12.3

Re: [PATCH] serial: Delete dead code for CIR serial ports

[Andy Shevchenko]

On Thu, 2017-06-15 at 17:54 +0200, Matthias Brugger wrote:
> 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.

> +		if (serial8250_isa_config != NULL)

> +			serial8250_isa_config(0, &uart->port,
> +					&uart->capabilities);

Can't it be one line after all?

>  

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

Ditto.

> +		if (ret == 0)
> +			ret = uart->port.line;

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

Re: [PATCH] serial: Delete dead code for CIR serial ports

[Matthias Brugger]

On 16/06/17 13:43, Andy Shevchenko wrote:
> On Thu, 2017-06-15 at 17:54 +0200, Matthias Brugger wrote:
>> 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.
> 
>> +		if (serial8250_isa_config != NULL)
> 
>> +			serial8250_isa_config(0, &uart->port,
>> +					&uart->capabilities);
> 
> Can't it be one line after all?
> 

No, that will exceed the 80 characters by line.

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

Yes, I'll fix this in v2.

Thanks,
Matthias