[PATCH 07/18] serial: Rename ns16550 functions to lower case

Andy Shevchenko andriy.shevchenko at linux.intel.com
Wed Dec 16 16:45:14 CET 2020


On Wed, Dec 16, 2020 at 08:24:55AM -0700, Simon Glass wrote:
> Lower case should be used for function names. Update this driver and its
> callers accordingly.

Reviewed-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>

> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
>  arch/arm/mach-davinci/da850_lowlevel.c     |  2 +-
>  arch/arm/mach-davinci/spl.c                |  4 ++--
>  arch/arm/mach-keystone/init.c              |  2 +-
>  board/Arcturus/ucp1020/spl.c               |  2 +-
>  board/Arcturus/ucp1020/spl_minimal.c       |  6 ++---
>  board/Synology/ds109/ds109.c               |  5 +++--
>  board/freescale/mpc8313erdb/mpc8313erdb.c  |  6 ++---
>  board/freescale/mpc8315erdb/mpc8315erdb.c  |  6 ++---
>  board/freescale/p1010rdb/spl.c             |  2 +-
>  board/freescale/p1010rdb/spl_minimal.c     |  6 ++---
>  board/freescale/p1_p2_rdb_pc/spl.c         |  2 +-
>  board/freescale/p1_p2_rdb_pc/spl_minimal.c |  6 ++---
>  board/freescale/t102xrdb/spl.c             |  2 +-
>  board/freescale/t104xrdb/spl.c             |  2 +-
>  board/freescale/t208xqds/spl.c             |  2 +-
>  board/freescale/t208xrdb/spl.c             |  2 +-
>  board/freescale/t4rdb/spl.c                |  2 +-
>  drivers/serial/ns16550.c                   | 26 +++++++++++-----------
>  drivers/serial/serial_ns16550.c            | 12 +++++-----
>  include/ns16550.h                          | 10 ++++-----
>  20 files changed, 54 insertions(+), 53 deletions(-)
> 
> diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c
> index 6994ded2c66..759c93747c7 100644
> --- a/arch/arm/mach-davinci/da850_lowlevel.c
> +++ b/arch/arm/mach-davinci/da850_lowlevel.c
> @@ -290,7 +290,7 @@ int arch_cpu_init(void)
>  	board_gpio_init();
>  
>  #if !CONFIG_IS_ENABLED(DM_SERIAL)
> -	NS16550_init((struct ns16550 *)(CONFIG_SYS_NS16550_COM1),
> +	ns16550_init((struct ns16550 *)(CONFIG_SYS_NS16550_COM1),
>  		     CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
>  #endif
>  	/*
> diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c
> index 3c8330b47f8..d0d7a814713 100644
> --- a/arch/arm/mach-davinci/spl.c
> +++ b/arch/arm/mach-davinci/spl.c
> @@ -27,9 +27,9 @@ void puts(const char *str)
>  void putc(char c)
>  {
>  	if (c == '\n')
> -		NS16550_putc((struct ns16550 *)(CONFIG_SYS_NS16550_COM1), '\r');
> +		ns16550_putc((struct ns16550 *)(CONFIG_SYS_NS16550_COM1), '\r');
>  
> -	NS16550_putc((struct ns16550 *)(CONFIG_SYS_NS16550_COM1), c);
> +	ns16550_putc((struct ns16550 *)(CONFIG_SYS_NS16550_COM1), c);
>  }
>  #endif /* CONFIG_SPL_LIBCOMMON_SUPPORT */
>  
> diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c
> index f4edaaaaaca..4950f146550 100644
> --- a/arch/arm/mach-keystone/init.c
> +++ b/arch/arm/mach-keystone/init.c
> @@ -185,7 +185,7 @@ int arch_cpu_init(void)
>  	 * driver doesn't handle this.
>  	 */
>  #ifndef CONFIG_DM_SERIAL
> -	NS16550_init((struct ns16550 *)(CONFIG_SYS_NS16550_COM2),
> +	ns16550_init((struct ns16550 *)(CONFIG_SYS_NS16550_COM2),
>  		     CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
>  #endif
>  
> diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
> index 8e607558f4d..4ed06a80b79 100644
> --- a/board/Arcturus/ucp1020/spl.c
> +++ b/board/Arcturus/ucp1020/spl.c
> @@ -58,7 +58,7 @@ void board_init_f(ulong bootflag)
>  	bus_clk = CONFIG_SYS_CLK_FREQ * plat_ratio;
>  	gd->bus_clk = bus_clk;
>  
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
>  		     bus_clk / 16 / CONFIG_BAUDRATE);
>  #ifdef CONFIG_SPL_MMC_BOOT
>  	puts("\nSD boot...\n");
> diff --git a/board/Arcturus/ucp1020/spl_minimal.c b/board/Arcturus/ucp1020/spl_minimal.c
> index 38d84afc9e2..90abec9cce5 100644
> --- a/board/Arcturus/ucp1020/spl_minimal.c
> +++ b/board/Arcturus/ucp1020/spl_minimal.c
> @@ -34,7 +34,7 @@ void board_init_f(ulong bootflag)
>  	plat_ratio >>= 1;
>  	gd->bus_clk = CONFIG_SYS_CLK_FREQ * plat_ratio;
>  
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
>  		     gd->bus_clk / 16 / CONFIG_BAUDRATE);
>  
>  	puts("\nNAND boot... ");
> @@ -55,9 +55,9 @@ void board_init_r(gd_t *gd, ulong dest_addr)
>  void putc(char c)
>  {
>  	if (c == '\n')
> -		NS16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, '\r');
> +		ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, '\r');
>  
> -	NS16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, c);
> +	ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, c);
>  }
>  
>  void puts(const char *str)
> diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
> index c36e4d37fc7..fe3b0eb554f 100644
> --- a/board/Synology/ds109/ds109.c
> +++ b/board/Synology/ds109/ds109.c
> @@ -108,8 +108,9 @@ void reset_misc(void)
>  
>  	b_d = ns16550_calc_divisor((struct ns16550 *)CONFIG_SYS_NS16550_COM2,
>  				   CONFIG_SYS_NS16550_CLK, 9600);
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM2, b_d);
> -	NS16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM2, SOFTWARE_REBOOT);
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM2, b_d);
> +	ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM2,
> +		     SOFTWARE_REBOOT);
>  }
>  
>  /* Support old kernels */
> diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c
> index 69fa89146d8..7e1a31f2650 100644
> --- a/board/freescale/mpc8313erdb/mpc8313erdb.c
> +++ b/board/freescale/mpc8313erdb/mpc8313erdb.c
> @@ -132,7 +132,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
>  void board_init_f(ulong bootflag)
>  {
>  	board_early_init_f();
> -	NS16550_init((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500),
> +	ns16550_init((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500),
>  		     CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
>  	puts("NAND boot... ");
>  	timer_init();
> @@ -152,8 +152,8 @@ void putc(char c)
>  		return;
>  
>  	if (c == '\n')
> -		NS16550_putc((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500), '\r');
> +		ns16550_putc((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500), '\r');
>  
> -	NS16550_putc((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500), c);
> +	ns16550_putc((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500), c);
>  }
>  #endif
> diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
> index fff8699d612..05b983a3f26 100644
> --- a/board/freescale/mpc8315erdb/mpc8315erdb.c
> +++ b/board/freescale/mpc8315erdb/mpc8315erdb.c
> @@ -220,7 +220,7 @@ int checkboard(void)
>  void board_init_f(ulong bootflag)
>  {
>  	board_early_init_f();
> -	NS16550_init((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500),
> +	ns16550_init((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500),
>  		     CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
>  	puts("NAND boot... ");
>  	timer_init();
> @@ -240,9 +240,9 @@ void putc(char c)
>  		return;
>  
>  	if (c == '\n')
> -		NS16550_putc((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500), '\r');
> +		ns16550_putc((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500), '\r');
>  
> -	NS16550_putc((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500), c);
> +	ns16550_putc((struct ns16550 *)(CONFIG_SYS_IMMR + 0x4500), c);
>  }
>  
>  #endif /* CONFIG_NAND_SPL */
> diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
> index c015a6bf36a..35b95e08389 100644
> --- a/board/freescale/p1010rdb/spl.c
> +++ b/board/freescale/p1010rdb/spl.c
> @@ -44,7 +44,7 @@ void board_init_f(ulong bootflag)
>  	plat_ratio >>= 1;
>  	gd->bus_clk = CONFIG_SYS_CLK_FREQ * plat_ratio;
>  
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
>  		     gd->bus_clk / 16 / CONFIG_BAUDRATE);
>  
>  #ifdef CONFIG_SPL_MMC_BOOT
> diff --git a/board/freescale/p1010rdb/spl_minimal.c b/board/freescale/p1010rdb/spl_minimal.c
> index 4cc70ea3522..989c5b139ac 100644
> --- a/board/freescale/p1010rdb/spl_minimal.c
> +++ b/board/freescale/p1010rdb/spl_minimal.c
> @@ -31,7 +31,7 @@ void board_init_f(ulong bootflag)
>  	plat_ratio >>= 1;
>  	gd->bus_clk = CONFIG_SYS_CLK_FREQ * plat_ratio;
>  
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
>  		     gd->bus_clk / 16 / CONFIG_BAUDRATE);
>  
>  	puts("\nNAND boot... ");
> @@ -53,9 +53,9 @@ void board_init_r(gd_t *gd, ulong dest_addr)
>  void putc(char c)
>  {
>  	if (c == '\n')
> -		NS16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, '\r');
> +		ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, '\r');
>  
> -	NS16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, c);
> +	ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, c);
>  }
>  
>  void puts(const char *str)
> diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
> index 0b8b8a75759..b16f701ae1a 100644
> --- a/board/freescale/p1_p2_rdb_pc/spl.c
> +++ b/board/freescale/p1_p2_rdb_pc/spl.c
> @@ -50,7 +50,7 @@ void board_init_f(ulong bootflag)
>  	bus_clk = CONFIG_SYS_CLK_FREQ * plat_ratio;
>  	gd->bus_clk = bus_clk;
>  
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
>  		     bus_clk / 16 / CONFIG_BAUDRATE);
>  #ifdef CONFIG_SPL_MMC_BOOT
>  	puts("\nSD boot...\n");
> diff --git a/board/freescale/p1_p2_rdb_pc/spl_minimal.c b/board/freescale/p1_p2_rdb_pc/spl_minimal.c
> index 7068e94a2d0..eb3f2c83fa2 100644
> --- a/board/freescale/p1_p2_rdb_pc/spl_minimal.c
> +++ b/board/freescale/p1_p2_rdb_pc/spl_minimal.c
> @@ -30,7 +30,7 @@ void board_init_f(ulong bootflag)
>  	plat_ratio >>= 1;
>  	gd->bus_clk = CONFIG_SYS_CLK_FREQ * plat_ratio;
>  
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
>  		     gd->bus_clk / 16 / CONFIG_BAUDRATE);
>  
>  	puts("\nNAND boot... ");
> @@ -51,9 +51,9 @@ void board_init_r(gd_t *gd, ulong dest_addr)
>  void putc(char c)
>  {
>  	if (c == '\n')
> -		NS16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, '\r');
> +		ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, '\r');
>  
> -	NS16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, c);
> +	ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, c);
>  }
>  
>  void puts(const char *str)
> diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
> index d23b2f5fde3..66d2f3bda7b 100644
> --- a/board/freescale/t102xrdb/spl.c
> +++ b/board/freescale/t102xrdb/spl.c
> @@ -82,7 +82,7 @@ void board_init_f(ulong bootflag)
>  	plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f;
>  	ccb_clk = sys_clk * plat_ratio / 2;
>  
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
>  		     ccb_clk / 16 / CONFIG_BAUDRATE);
>  
>  #if defined(CONFIG_SPL_MMC_BOOT)
> diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
> index a93cc38450d..28ac12a1fd0 100644
> --- a/board/freescale/t104xrdb/spl.c
> +++ b/board/freescale/t104xrdb/spl.c
> @@ -81,7 +81,7 @@ void board_init_f(ulong bootflag)
>  	plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f;
>  	uart_clk = sys_clk * plat_ratio / 2;
>  
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
>  		     uart_clk / 16 / CONFIG_BAUDRATE);
>  
>  	relocate_code(CONFIG_SPL_RELOC_STACK, (gd_t *)CONFIG_SPL_GD_ADDR, 0x0);
> diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
> index c6b23e4c690..13e61f083f6 100644
> --- a/board/freescale/t208xqds/spl.c
> +++ b/board/freescale/t208xqds/spl.c
> @@ -81,7 +81,7 @@ void board_init_f(ulong bootflag)
>  	plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f;
>  	ccb_clk = sys_clk * plat_ratio / 2;
>  
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
>  		     ccb_clk / 16 / CONFIG_BAUDRATE);
>  
>  #if defined(CONFIG_SPL_MMC_BOOT)
> diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
> index 4b843830165..2bba94da7bc 100644
> --- a/board/freescale/t208xrdb/spl.c
> +++ b/board/freescale/t208xrdb/spl.c
> @@ -51,7 +51,7 @@ void board_init_f(ulong bootflag)
>  	plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f;
>  	ccb_clk = sys_clk * plat_ratio / 2;
>  
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
>  		     ccb_clk / 16 / CONFIG_BAUDRATE);
>  
>  #if defined(CONFIG_SPL_MMC_BOOT)
> diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
> index efe2b4eb95c..fc624efbe63 100644
> --- a/board/freescale/t4rdb/spl.c
> +++ b/board/freescale/t4rdb/spl.c
> @@ -60,7 +60,7 @@ void board_init_f(ulong bootflag)
>  	plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f;
>  	ccb_clk = sys_clk * plat_ratio / 2;
>  
> -	NS16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
> +	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
>  		     ccb_clk / 16 / CONFIG_BAUDRATE);
>  
>  	puts("\nSD boot...\n");
> diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
> index d529b1b8072..17808fb70a5 100644
> --- a/drivers/serial/ns16550.c
> +++ b/drivers/serial/ns16550.c
> @@ -212,7 +212,7 @@ int ns16550_calc_divisor(struct ns16550 *port, int clock, int baudrate)
>  	return DIV_ROUND_CLOSEST(clock, mode_x_div * baudrate);
>  }
>  
> -static void NS16550_setbrg(struct ns16550 *com_port, int baud_divisor)
> +static void ns16550_setbrg(struct ns16550 *com_port, int baud_divisor)
>  {
>  	/* to keep serial format, read lcr before writing BKSE */
>  	int lcr_val = serial_in(&com_port->lcr) & ~UART_LCR_BKSE;
> @@ -223,7 +223,7 @@ static void NS16550_setbrg(struct ns16550 *com_port, int baud_divisor)
>  	serial_out(lcr_val, &com_port->lcr);
>  }
>  
> -void NS16550_init(struct ns16550 *com_port, int baud_divisor)
> +void ns16550_init(struct ns16550 *com_port, int baud_divisor)
>  {
>  #if (defined(CONFIG_SPL_BUILD) && \
>  		(defined(CONFIG_OMAP34XX) || defined(CONFIG_OMAP44XX)))
> @@ -235,13 +235,13 @@ void NS16550_init(struct ns16550 *com_port, int baud_divisor)
>  	if ((serial_in(&com_port->lsr) & (UART_LSR_TEMT | UART_LSR_THRE))
>  	     == UART_LSR_THRE) {
>  		if (baud_divisor != -1)
> -			NS16550_setbrg(com_port, baud_divisor);
> +			ns16550_setbrg(com_port, baud_divisor);
>  		else {
>  			// Re-use old baud rate divisor to flush transmit reg.
>  			const int dll = serial_in(&com_port->dll);
>  			const int dlm = serial_in(&com_port->dlm);
>  			const int divisor = dll | (dlm << 8);
> -			NS16550_setbrg(com_port, divisor);
> +			ns16550_setbrg(com_port, divisor);
>  		}
>  		serial_out(0, &com_port->mdr1);
>  	}
> @@ -260,7 +260,7 @@ void NS16550_init(struct ns16550 *com_port, int baud_divisor)
>  	/* initialize serial config to 8N1 before writing baudrate */
>  	serial_out(UART_LCRVAL, &com_port->lcr);
>  	if (baud_divisor != -1)
> -		NS16550_setbrg(com_port, baud_divisor);
> +		ns16550_setbrg(com_port, baud_divisor);
>  #if defined(CONFIG_ARCH_OMAP2PLUS) || defined(CONFIG_SOC_DA8XX) || \
>  	defined(CONFIG_OMAP_SERIAL)
>  	/* /16 is proper to hit 115200 with 48MHz */
> @@ -272,17 +272,17 @@ void NS16550_init(struct ns16550 *com_port, int baud_divisor)
>  }
>  
>  #ifndef CONFIG_NS16550_MIN_FUNCTIONS
> -void NS16550_reinit(struct ns16550 *com_port, int baud_divisor)
> +void ns16550_reinit(struct ns16550 *com_port, int baud_divisor)
>  {
>  	serial_out(CONFIG_SYS_NS16550_IER, &com_port->ier);
> -	NS16550_setbrg(com_port, 0);
> +	ns16550_setbrg(com_port, 0);
>  	serial_out(UART_MCRVAL, &com_port->mcr);
>  	serial_out(ns16550_getfcr(com_port), &com_port->fcr);
> -	NS16550_setbrg(com_port, baud_divisor);
> +	ns16550_setbrg(com_port, baud_divisor);
>  }
>  #endif /* CONFIG_NS16550_MIN_FUNCTIONS */
>  
> -void NS16550_putc(struct ns16550 *com_port, char c)
> +void ns16550_putc(struct ns16550 *com_port, char c)
>  {
>  	while ((serial_in(&com_port->lsr) & UART_LSR_THRE) == 0)
>  		;
> @@ -299,7 +299,7 @@ void NS16550_putc(struct ns16550 *com_port, char c)
>  }
>  
>  #ifndef CONFIG_NS16550_MIN_FUNCTIONS
> -char NS16550_getc(struct ns16550 *com_port)
> +char ns16550_getc(struct ns16550 *com_port)
>  {
>  	while ((serial_in(&com_port->lsr) & UART_LSR_DR) == 0) {
>  #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_USB_TTY)
> @@ -311,7 +311,7 @@ char NS16550_getc(struct ns16550 *com_port)
>  	return serial_in(&com_port->rbr);
>  }
>  
> -int NS16550_tstc(struct ns16550 *com_port)
> +int ns16550_tstc(struct ns16550 *com_port)
>  {
>  	return (serial_in(&com_port->lsr) & UART_LSR_DR) != 0;
>  }
> @@ -423,7 +423,7 @@ static int ns16550_serial_setbrg(struct udevice *dev, int baudrate)
>  
>  	clock_divisor = ns16550_calc_divisor(com_port, plat->clock, baudrate);
>  
> -	NS16550_setbrg(com_port, clock_divisor);
> +	ns16550_setbrg(com_port, clock_divisor);
>  
>  	return 0;
>  }
> @@ -520,7 +520,7 @@ int ns16550_serial_probe(struct udevice *dev)
>  		reset_deassert_bulk(&reset_bulk);
>  
>  	com_port->plat = dev_get_plat(dev);
> -	NS16550_init(com_port, -1);
> +	ns16550_init(com_port, -1);
>  
>  	return 0;
>  }
> diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
> index a8d3602e9b1..b5beca976d3 100644
> --- a/drivers/serial/serial_ns16550.c
> +++ b/drivers/serial/serial_ns16550.c
> @@ -78,7 +78,7 @@ static struct ns16550 *serial_ports[6] = {
>  		int clock_divisor; \
>  		clock_divisor = ns16550_calc_divisor(serial_ports[port-1], \
>  				CONFIG_SYS_NS16550_CLK, gd->baudrate); \
> -		NS16550_init(serial_ports[port-1], clock_divisor); \
> +		ns16550_init(serial_ports[port - 1], clock_divisor); \
>  		return 0 ; \
>  	} \
>  	static void eserial##port##_setbrg(void) \
> @@ -117,9 +117,9 @@ static struct ns16550 *serial_ports[6] = {
>  static void _serial_putc(const char c, const int port)
>  {
>  	if (c == '\n')
> -		NS16550_putc(PORT, '\r');
> +		ns16550_putc(PORT, '\r');
>  
> -	NS16550_putc(PORT, c);
> +	ns16550_putc(PORT, c);
>  }
>  
>  static void _serial_puts(const char *s, const int port)
> @@ -131,12 +131,12 @@ static void _serial_puts(const char *s, const int port)
>  
>  static int _serial_getc(const int port)
>  {
> -	return NS16550_getc(PORT);
> +	return ns16550_getc(PORT);
>  }
>  
>  static int _serial_tstc(const int port)
>  {
> -	return NS16550_tstc(PORT);
> +	return ns16550_tstc(PORT);
>  }
>  
>  static void _serial_setbrg(const int port)
> @@ -145,7 +145,7 @@ static void _serial_setbrg(const int port)
>  
>  	clock_divisor = ns16550_calc_divisor(PORT, CONFIG_SYS_NS16550_CLK,
>  					     gd->baudrate);
> -	NS16550_reinit(PORT, clock_divisor);
> +	ns16550_reinit(PORT, clock_divisor);
>  }
>  
>  static inline void
> diff --git a/include/ns16550.h b/include/ns16550.h
> index 75c5bf61fd3..bef20719980 100644
> --- a/include/ns16550.h
> +++ b/include/ns16550.h
> @@ -222,11 +222,11 @@ struct ns16550 {
>  /* useful defaults for LCR */
>  #define UART_LCR_8N1	0x03
>  
> -void NS16550_init(struct ns16550 *com_port, int baud_divisor);
> -void NS16550_putc(struct ns16550 *com_port, char c);
> -char NS16550_getc(struct ns16550 *com_port);
> -int NS16550_tstc(struct ns16550 *com_port);
> -void NS16550_reinit(struct ns16550 *com_port, int baud_divisor);
> +void ns16550_init(struct ns16550 *com_port, int baud_divisor);
> +void ns16550_putc(struct ns16550 *com_port, char c);
> +char ns16550_getc(struct ns16550 *com_port);
> +int ns16550_tstc(struct ns16550 *com_port);
> +void ns16550_reinit(struct ns16550 *com_port, int baud_divisor);
>  
>  /**
>   * ns16550_calc_divisor() - calculate the divisor given clock and baud rate
> -- 
> 2.29.2.684.gfbc64c5ab5-goog
> 

-- 
With Best Regards,
Andy Shevchenko




More information about the U-Boot mailing list