diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/altera_jtag_uart.c | 8 | ||||
| -rw-r--r-- | drivers/serial/altera_uart.c | 9 | ||||
| -rw-r--r-- | drivers/serial/atmel_usart.c | 8 | ||||
| -rw-r--r-- | drivers/serial/lpc32xx_hsuart.c | 8 | ||||
| -rw-r--r-- | drivers/serial/mcfuart.c | 9 | ||||
| -rw-r--r-- | drivers/serial/ns9750_serial.c | 15 | ||||
| -rw-r--r-- | drivers/serial/opencores_yanu.c | 10 | ||||
| -rw-r--r-- | drivers/serial/s3c4510b_uart.c | 6 | ||||
| -rw-r--r-- | drivers/serial/s3c64xx.c | 8 | ||||
| -rw-r--r-- | drivers/serial/serial_clps7111.c | 9 | ||||
| -rw-r--r-- | drivers/serial/serial_imx.c | 9 | ||||
| -rw-r--r-- | drivers/serial/serial_ixp.c | 9 | ||||
| -rw-r--r-- | drivers/serial/serial_ks8695.c | 9 | ||||
| -rw-r--r-- | drivers/serial/serial_lh7a40x.c | 9 | ||||
| -rw-r--r-- | drivers/serial/serial_lpc2292.c | 9 | ||||
| -rw-r--r-- | drivers/serial/serial_mxc.c | 9 | ||||
| -rw-r--r-- | drivers/serial/serial_netarm.c | 9 | ||||
| -rw-r--r-- | drivers/serial/serial_pl01x.c | 9 | ||||
| -rw-r--r-- | drivers/serial/serial_s3c44b0.c | 9 | ||||
| -rw-r--r-- | drivers/serial/serial_sa1100.c | 9 | ||||
| -rw-r--r-- | drivers/serial/serial_sh.c | 9 | 
21 files changed, 22 insertions, 167 deletions
| diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c index 654b5019e..28319baf1 100644 --- a/drivers/serial/altera_jtag_uart.c +++ b/drivers/serial/altera_jtag_uart.c @@ -59,12 +59,6 @@ static void altera_jtag_serial_putc(char c)  	writel ((unsigned char)c, &jtag->data);  } -static void altera_jtag_serial_puts(const char *s) -{ -	while (*s != 0) -		serial_putc (*s++); -} -  static int altera_jtag_serial_tstc(void)  {  	return ( readl (&jtag->control) & NIOS_JTAG_RRDY); @@ -91,7 +85,7 @@ static struct serial_device altera_jtag_serial_drv = {  	.stop	= NULL,  	.setbrg	= altera_jtag_serial_setbrg,  	.putc	= altera_jtag_serial_putc, -	.puts	= altera_jtag_serial_puts, +	.puts	= default_serial_puts,  	.getc	= altera_jtag_serial_getc,  	.tstc	= altera_jtag_serial_tstc,  }; diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index 27550ed48..118cd58ec 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -82,13 +82,6 @@ static void altera_serial_putc(char c)  	writel ((unsigned char)c, &uart->txdata);  } -static void altera_serial_puts(const char *s) -{ -	while (*s != 0) { -		serial_putc (*s++); -	} -} -  static int altera_serial_tstc(void)  {  	return (readl (&uart->status) & NIOS_UART_RRDY); @@ -107,7 +100,7 @@ static struct serial_device altera_serial_drv = {  	.stop	= NULL,  	.setbrg	= altera_serial_setbrg,  	.putc	= altera_serial_putc, -	.puts	= altera_serial_puts, +	.puts	= default_serial_puts,  	.getc	= altera_serial_getc,  	.tstc	= altera_serial_tstc,  }; diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index 130303129..c4d7432ef 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -86,12 +86,6 @@ static void atmel_serial_putc(char c)  	writel(c, &usart->thr);  } -static void atmel_serial_puts(const char *s) -{ -	while (*s) -		serial_putc(*s++); -} -  static int atmel_serial_getc(void)  {  	atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE; @@ -113,7 +107,7 @@ static struct serial_device atmel_serial_drv = {  	.stop	= NULL,  	.setbrg	= atmel_serial_setbrg,  	.putc	= atmel_serial_putc, -	.puts	= atmel_serial_puts, +	.puts	= default_serial_puts,  	.getc	= atmel_serial_getc,  	.tstc	= atmel_serial_tstc,  }; diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c index 02429b554..755991657 100644 --- a/drivers/serial/lpc32xx_hsuart.c +++ b/drivers/serial/lpc32xx_hsuart.c @@ -77,19 +77,13 @@ static int lpc32xx_serial_init(void)  	return 0;  } -static void lpc32xx_serial_puts(const char *s) -{ -	while (*s) -		serial_putc(*s++); -} -  static struct serial_device lpc32xx_serial_drv = {  	.name	= "lpc32xx_serial",  	.start	= lpc32xx_serial_init,  	.stop	= NULL,  	.setbrg	= lpc32xx_serial_setbrg,  	.putc	= lpc32xx_serial_putc, -	.puts	= lpc32xx_serial_puts, +	.puts	= default_serial_puts,  	.getc	= lpc32xx_serial_getc,  	.tstc	= lpc32xx_serial_tstc,  }; diff --git a/drivers/serial/mcfuart.c b/drivers/serial/mcfuart.c index 00a711469..8ea9af0f6 100644 --- a/drivers/serial/mcfuart.c +++ b/drivers/serial/mcfuart.c @@ -87,13 +87,6 @@ static void mcf_serial_putc(const char c)  	uart->utb = c;  } -static void mcf_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc(*s++); -	} -} -  static int mcf_serial_getc(void)  {  	volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE); @@ -136,7 +129,7 @@ static struct serial_device mcf_serial_drv = {  	.stop	= NULL,  	.setbrg	= mcf_serial_setbrg,  	.putc	= mcf_serial_putc, -	.puts	= mcf_serial_puts, +	.puts	= default_serial_puts,  	.getc	= mcf_serial_getc,  	.tstc	= mcf_serial_tstc,  }; diff --git a/drivers/serial/ns9750_serial.c b/drivers/serial/ns9750_serial.c index cb545c406..85fc68a07 100644 --- a/drivers/serial/ns9750_serial.c +++ b/drivers/serial/ns9750_serial.c @@ -100,19 +100,6 @@ static void ns9750_serial_putc(const char c)  }  /*********************************************************************** - * @Function: serial_puts - * @Return: n/a - * @Descr: writes non-zero string to the FIFO. - ***********************************************************************/ - -static void ns9750_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc( *s++ ); -	} -} - -/***********************************************************************   * @Function: serial_getc   * @Return: the character read   * @Descr: performs only 8bit accesses to the FIFO. No error handling @@ -215,7 +202,7 @@ static struct serial_device ns9750_serial_drv = {  	.stop	= NULL,  	.setbrg	= ns9750_serial_setbrg,  	.putc	= ns9750_serial_putc, -	.puts	= ns9750_serial_puts, +	.puts	= default_serial_puts,  	.getc	= ns9750_serial_getc,  	.tstc	= ns9750_serial_tstc,  }; diff --git a/drivers/serial/opencores_yanu.c b/drivers/serial/opencores_yanu.c index 49bccf3a6..4ca6ef0b2 100644 --- a/drivers/serial/opencores_yanu.c +++ b/drivers/serial/opencores_yanu.c @@ -161,14 +161,6 @@ static void oc_serial_putc(char c)  	writel((unsigned char)c, &uart->data);  } -static void oc_serial_puts(const char *s) -{ -	while (*s != 0) { -		serial_putc (*s++); -	} -} - -  static int oc_serial_tstc(void)  {  	unsigned status ; @@ -195,7 +187,7 @@ static struct serial_device oc_serial_drv = {  	.stop	= NULL,  	.setbrg	= oc_serial_setbrg,  	.putc	= oc_serial_putc, -	.puts	= oc_serial_puts, +	.puts	= default_serial_puts,  	.getc	= oc_serial_getc,  	.tstc	= oc_serial_tstc,  }; diff --git a/drivers/serial/s3c4510b_uart.c b/drivers/serial/s3c4510b_uart.c index 423d26e67..c460229e0 100644 --- a/drivers/serial/s3c4510b_uart.c +++ b/drivers/serial/s3c4510b_uart.c @@ -199,12 +199,10 @@ static int s3c4510b_serial_getc(void)  static void s3c4510b_serial_puts(const char *s)  { -	while (*s) { -		serial_putc (*s++); -	} +	default_serial_puts(s);  	/* busy wait for tx complete */ -	while ( !uart->m_stat.bf.txComplete); +	while (!uart->m_stat.bf.txComplete);  	/* clear break */  	uart->m_ctrl.bf.sendBreak = 0; diff --git a/drivers/serial/s3c64xx.c b/drivers/serial/s3c64xx.c index 9ab8a28d8..ea8d734a9 100644 --- a/drivers/serial/s3c64xx.c +++ b/drivers/serial/s3c64xx.c @@ -166,19 +166,13 @@ static int s3c64xx_serial_tstc(void)  	return uart->UTRSTAT & 0x1;  } -static void s3c64xx_serial_puts(const char *s) -{ -	while (*s) -		serial_putc(*s++); -} -  static struct serial_device s3c64xx_serial_drv = {  	.name	= "s3c64xx_serial",  	.start	= s3c64xx_serial_init,  	.stop	= NULL,  	.setbrg	= s3c64xx_serial_setbrg,  	.putc	= s3c64xx_serial_putc, -	.puts	= s3c64xx_serial_puts, +	.puts	= default_serial_puts,  	.getc	= s3c64xx_serial_getc,  	.tstc	= s3c64xx_serial_tstc,  }; diff --git a/drivers/serial/serial_clps7111.c b/drivers/serial/serial_clps7111.c index 65473e860..c292ed875 100644 --- a/drivers/serial/serial_clps7111.c +++ b/drivers/serial/serial_clps7111.c @@ -112,20 +112,13 @@ static int clps7111_serial_getc(void)  	return IO_UARTDR1 & 0xff;  } -static void clps7111_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc (*s++); -	} -} -  static struct serial_device clps7111_serial_drv = {  	.name	= "clps7111_serial",  	.start	= clps7111_serial_init,  	.stop	= NULL,  	.setbrg	= clps7111_serial_setbrg,  	.putc	= clps7111_serial_putc, -	.puts	= clps7111_serial_puts, +	.puts	= default_serial_puts,  	.getc	= clps7111_serial_getc,  	.tstc	= clps7111_serial_tstc,  }; diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index 6c075b5b9..9b9be44c5 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -214,20 +214,13 @@ static int imx_serial_tstc(void)  	return 1;  } -static void imx_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc (*s++); -	} -} -  static struct serial_device imx_serial_drv = {  	.name	= "imx_serial",  	.start	= imx_serial_init,  	.stop	= NULL,  	.setbrg	= imx_serial_setbrg,  	.putc	= imx_serial_putc, -	.puts	= imx_serial_puts, +	.puts	= default_serial_puts,  	.getc	= imx_serial_getc,  	.tstc	= imx_serial_tstc,  }; diff --git a/drivers/serial/serial_ixp.c b/drivers/serial/serial_ixp.c index c8b3658d4..09a3df401 100644 --- a/drivers/serial/serial_ixp.c +++ b/drivers/serial/serial_ixp.c @@ -121,20 +121,13 @@ static int ixp_serial_getc(void)  	return (char) RBR(CONFIG_SYS_IXP425_CONSOLE) & 0xff;  } -static void ixp_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc (*s++); -	} -} -  static struct serial_device ixp_serial_drv = {  	.name	= "ixp_serial",  	.start	= ixp_serial_init,  	.stop	= NULL,  	.setbrg	= ixp_serial_setbrg,  	.putc	= ixp_serial_putc, -	.puts	= ixp_serial_puts, +	.puts	= default_serial_puts,  	.getc	= ixp_serial_getc,  	.tstc	= ixp_serial_tstc,  }; diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c index 60e800720..8b1c974de 100644 --- a/drivers/serial/serial_ks8695.c +++ b/drivers/serial/serial_ks8695.c @@ -102,13 +102,6 @@ static int ks8695_serial_tstc(void)  	return 0;  } -static void ks8695_serial_puts(const char *s) -{ -	char c; -	while ((c = *s++) != 0) -		serial_putc(c); -} -  static int ks8695_serial_getc(void)  {  	volatile struct ks8695uart *uartp = KS8695_UART_ADDR; @@ -124,7 +117,7 @@ static struct serial_device ks8695_serial_drv = {  	.stop	= NULL,  	.setbrg	= ks8695_serial_setbrg,  	.putc	= ks8695_serial_putc, -	.puts	= ks8695_serial_puts, +	.puts	= default_serial_puts,  	.getc	= ks8695_serial_getc,  	.tstc	= ks8695_serial_tstc,  }; diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index 6c9628581..68e958ba7 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c @@ -175,20 +175,13 @@ static int lh7a40x_serial_tstc(void)  	return(!(uart->status & UART_RXFE));  } -static void lh7a40x_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc (*s++); -	} -} -  static struct serial_device lh7a40x_serial_drv = {  	.name	= "lh7a40x_serial",  	.start	= lh7a40x_serial_init,  	.stop	= NULL,  	.setbrg	= lh7a40x_serial_setbrg,  	.putc	= lh7a40x_serial_putc, -	.puts	= lh7a40x_serial_puts, +	.puts	= default_serial_puts,  	.getc	= lh7a40x_serial_getc,  	.tstc	= lh7a40x_serial_tstc,  }; diff --git a/drivers/serial/serial_lpc2292.c b/drivers/serial/serial_lpc2292.c index fcab20280..8abc47671 100644 --- a/drivers/serial/serial_lpc2292.c +++ b/drivers/serial/serial_lpc2292.c @@ -89,13 +89,6 @@ static int lpc2292_serial_getc(void)  	return GET8(U0RBR);  } -static void lpc2292_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc (*s++); -	} -} -  /* Test if there is a byte to read */  static int lpc2292_serial_tstc(void)  { @@ -108,7 +101,7 @@ static struct serial_device lpc2292_serial_drv = {  	.stop	= NULL,  	.setbrg	= lpc2292_serial_setbrg,  	.putc	= lpc2292_serial_putc, -	.puts	= lpc2292_serial_puts, +	.puts	= default_serial_puts,  	.getc	= lpc2292_serial_getc,  	.tstc	= lpc2292_serial_tstc,  }; diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index b0612f5ac..9227d6408 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -187,13 +187,6 @@ static int mxc_serial_tstc(void)  	return 1;  } -static void mxc_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc (*s++); -	} -} -  /*   * Initialise the serial port with the given baudrate. The settings   * are always 8 data bits, no parity, 1 stop bit, no start bits. @@ -228,7 +221,7 @@ static struct serial_device mxc_serial_drv = {  	.stop	= NULL,  	.setbrg	= mxc_serial_setbrg,  	.putc	= mxc_serial_putc, -	.puts	= mxc_serial_puts, +	.puts	= default_serial_puts,  	.getc	= mxc_serial_getc,  	.tstc	= mxc_serial_tstc,  }; diff --git a/drivers/serial/serial_netarm.c b/drivers/serial/serial_netarm.c index d30adc318..44d7c500c 100644 --- a/drivers/serial/serial_netarm.c +++ b/drivers/serial/serial_netarm.c @@ -182,20 +182,13 @@ static int netarm_serial_getc(void)  	return ch_uint & 0xff;  } -static void netarm_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc (*s++); -	} -} -  static struct serial_device netarm_serial_drv = {  	.name	= "netarm_serial",  	.start	= netarm_serial_init,  	.stop	= NULL,  	.setbrg	= netarm_serial_setbrg,  	.putc	= netarm_serial_putc, -	.puts	= netarm_serial_puts, +	.puts	= default_serial_puts,  	.getc	= netarm_serial_getc,  	.tstc	= netarm_serial_tstc,  }; diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 7db7b65c3..b331be794 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -179,13 +179,6 @@ static void pl01x_serial_putc(const char c)  	pl01x_putc (CONSOLE_PORT, c);  } -static void pl01x_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc (*s++); -	} -} -  static int pl01x_serial_getc(void)  {  	return pl01x_getc (CONSOLE_PORT); @@ -259,7 +252,7 @@ static struct serial_device pl01x_serial_drv = {  	.stop	= NULL,  	.setbrg	= pl01x_serial_setbrg,  	.putc	= pl01x_serial_putc, -	.puts	= pl01x_serial_puts, +	.puts	= default_serial_puts,  	.getc	= pl01x_serial_getc,  	.tstc	= pl01x_serial_tstc,  }; diff --git a/drivers/serial/serial_s3c44b0.c b/drivers/serial/serial_s3c44b0.c index a4428e0f4..9cae84308 100644 --- a/drivers/serial/serial_s3c44b0.c +++ b/drivers/serial/serial_s3c44b0.c @@ -209,20 +209,13 @@ static int s3c44b0_serial_getc(void)  	}  } -static void s3c44b0_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc (*s++); -	} -} -  static struct serial_device s3c44b0_serial_drv = {  	.name	= "s3c44b0_serial",  	.start	= s3c44b0_serial_init,  	.stop	= NULL,  	.setbrg	= s3c44b0_serial_setbrg,  	.putc	= s3c44b0_serial_putc, -	.puts	= s3c44b0_serial_puts, +	.puts	= default_serial_puts,  	.getc	= s3c44b0_serial_getc,  	.tstc	= s3c44b0_serial_tstc,  }; diff --git a/drivers/serial/serial_sa1100.c b/drivers/serial/serial_sa1100.c index c6b34db7c..3c0f4c59f 100644 --- a/drivers/serial/serial_sa1100.c +++ b/drivers/serial/serial_sa1100.c @@ -153,20 +153,13 @@ static int sa1100_serial_getc(void)  #endif  } -static void sa1100_serial_puts(const char *s) -{ -	while (*s) { -		serial_putc (*s++); -	} -} -  static struct serial_device sa1100_serial_drv = {  	.name	= "sa1100_serial",  	.start	= sa1100_serial_init,  	.stop	= NULL,  	.setbrg	= sa1100_serial_setbrg,  	.putc	= sa1100_serial_putc, -	.puts	= sa1100_serial_puts, +	.puts	= default_serial_puts,  	.getc	= sa1100_serial_getc,  	.tstc	= sa1100_serial_tstc,  }; diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index 1ddfc7d87..3c931d021 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -136,13 +136,6 @@ static void sh_serial_putc(const char c)  	serial_raw_putc(c);  } -static void sh_serial_puts(const char *s) -{ -	char c; -	while ((c = *s++) != 0) -		serial_putc(c); -} -  static int sh_serial_tstc(void)  {  	return serial_rx_fifo_level() ? 1 : 0; @@ -196,7 +189,7 @@ static struct serial_device sh_serial_drv = {  	.stop	= NULL,  	.setbrg	= sh_serial_setbrg,  	.putc	= sh_serial_putc, -	.puts	= sh_serial_puts, +	.puts	= default_serial_puts,  	.getc	= sh_serial_getc,  	.tstc	= sh_serial_tstc,  }; |