diff mbox

[U-Boot,3/5] Remove unused CONFIG_HWFLOW option and associated dead code.

Message ID 1454741849-1914-4-git-send-email-d.mueller@elsoft.ch
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

David Müller (ELSOFT AG) Feb. 6, 2016, 6:57 a.m. UTC 
Signed-off-by: David Müller <d.mueller@elsoft.ch>
---
 drivers/serial/serial_imx.c     |  7 -------
 drivers/serial/serial_s3c24x0.c | 35 -----------------------------------
 2 files changed, 42 deletions(-)

Comments

Tom Rini Feb. 8, 2016, 8:50 p.m. UTC | #1 
On Sat, Feb 06, 2016 at 07:57:27AM +0100, David Müller (ELSOFT AG) wrote:

> Signed-off-by: David Müller <d.mueller@elsoft.ch>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index d43a5fe..8d9166b 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -164,13 +164,6 @@  static int imx_serial_getc(void)
 	return ch;
 }
 
-#ifdef CONFIG_HWFLOW
-static int hwflow = 0; /* turned off by default */
-int hwflow_onoff(int on)
-{
-}
-#endif
-
 /*
  * Output a single byte to the serial port.
  */
diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c
index 4cc94d9..fb895fd 100644
--- a/drivers/serial/serial_s3c24x0.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -65,10 +65,6 @@  DECLARE_GLOBAL_DATA_PTR;
 	.puts	= s3serial##port##_puts,		\
 }
 
-#ifdef CONFIG_HWFLOW
-static int hwflow;
-#endif
-
 static void _serial_setbrg(const int dev_index)
 {
 	struct s3c24x0_uart *uart = s3c24x0_get_base_uart(dev_index);
@@ -95,10 +91,6 @@  static int serial_init_dev(const int dev_index)
 {
 	struct s3c24x0_uart *uart = s3c24x0_get_base_uart(dev_index);
 
-#ifdef CONFIG_HWFLOW
-	hwflow = 0;	/* turned off by default */
-#endif
-
 	/* FIFO enable, Tx/Rx FIFO clear */
 	writel(0x07, &uart->ufcon);
 	writel(0x0, &uart->umcon);
@@ -111,10 +103,6 @@  static int serial_init_dev(const int dev_index)
 	 */
 	writel(0x245, &uart->ucon);
 
-#ifdef CONFIG_HWFLOW
-	writel(0x1, &uart->umcon);	/* rts up */
-#endif
-
 	/* FIXME: This is sooooooooooooooooooo ugly */
 #if defined(CONFIG_ARCH_GTA02_v1) || defined(CONFIG_ARCH_GTA02_v2)
 	/* we need auto hw flow control on the gsm and gps port */
@@ -146,24 +134,6 @@  static inline int serial_getc_dev(unsigned int dev_index)
 	return _serial_getc(dev_index);
 }
 
-#ifdef CONFIG_HWFLOW
-int hwflow_onoff(int on)
-{
-	switch (on) {
-	case 0:
-	default:
-		break;		/* return current */
-	case 1:
-		hwflow = 1;	/* turn on */
-		break;
-	case -1:
-		hwflow = 0;	/* turn off */
-		break;
-	}
-	return hwflow;
-}
-#endif
-
 /*
  * Output a single byte to the serial port.
  */
@@ -174,11 +144,6 @@  static void _serial_putc(const char c, const int dev_index)
 	while (!(readl(&uart->utrstat) & 0x2))
 		/* wait for room in the tx FIFO */ ;
 
-#ifdef CONFIG_HWFLOW
-	while (hwflow && !(readl(&uart->umstat) & 0x1))
-		/* Wait for CTS up */ ;
-#endif
-
 	writeb(c, &uart->utxh);
 
 	/* If \n, also do \r */