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

Path	csiph.com!weretis.net!feeder4.news.weretis.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	Matthias Brugger <mbrugger@suse.com>
Newsgroups	linux.kernel
Subject	[PATCH v2] serial: Delete dead code for CIR serial ports
Date	Fri, 16 Jun 2017 17:20:01 +0200
Message-ID	<tT1ct-1LU-1@gated-at.bofh.it> (permalink)
X-Original-To	gregkh@linuxfoundation.org, jslaby@suse.com
X-Mailer	git-send-email 2.12.3
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	49
Organization	linux.* mail to news gateway
X-Original-Cc	andriy.shevchenko@linux.intel.com, ed.blake@imgtec.com, vigneshr@ti.com, alexander.sverdlin@nokia.com, yegorslists@googlemail.com, mbrugger@suse.com, dhowells@redhat.com, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Fri, 16 Jun 2017 17:17:14 +0200
X-Original-Message-ID	<20170616151714.30835-1-mbrugger@suse.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1667823

Show key headers only | View raw

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 | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 1aab3010fbfa..b5def356af63 100644
--- 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);
 
-- 
2.12.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] serial: Delete dead code for CIR serial ports Matthias Brugger <mbrugger@suse.com> - 2017-06-16 17:20 +0200
  Re: [PATCH v2] serial: Delete dead code for CIR serial ports Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-06-16 19:40 +0200

csiph-web