Commit b6a8f6ab authored by Sherry Sun's avatar Sherry Sun Committed by Greg Kroah-Hartman
Browse files

tty: serial: fsl_lpuart: Use u32 and u8 for register variables 



Use u32 and u8 rather than unsigned long or unsigned char for register
variables for clarity and consistency.

Signed-off-by: default avatarSherry Sun <sherry.sun@nxp.com>
Link: https://lore.kernel.org/r/20250312023904.1343351-2-sherry.sun@nxp.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f5cb528d

drivers/tty/serial/fsl_lpuart.c

+46 −47
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ static unsigned int lpuart_get_baud_clk_rate(struct lpuart_port *sport) 


static void lpuart_stop_tx(struct uart_port *port)

{

	unsigned char temp;

	u8 temp;



	temp = readb(port->membase + UARTCR2);

	temp &= ~(UARTCR2_TIE | UARTCR2_TCIE);
@@ -450,7 +450,7 @@ static void lpuart_stop_tx(struct uart_port *port) 


static void lpuart32_stop_tx(struct uart_port *port)

{

	unsigned long temp;

	u32 temp;



	temp = lpuart32_read(port, UARTCTRL);

	temp &= ~(UARTCTRL_TIE | UARTCTRL_TCIE);
@@ -459,7 +459,7 @@ static void lpuart32_stop_tx(struct uart_port *port) 


static void lpuart_stop_rx(struct uart_port *port)

{

	unsigned char temp;

	u8 temp;



	temp = readb(port->membase + UARTCR2);

	writeb(temp & ~UARTCR2_RE, port->membase + UARTCR2);
@@ -467,7 +467,7 @@ static void lpuart_stop_rx(struct uart_port *port) 


static void lpuart32_stop_rx(struct uart_port *port)

{

	unsigned long temp;

	u32 temp;



	temp = lpuart32_read(port, UARTCTRL);

	lpuart32_write(port, temp & ~UARTCTRL_RE, UARTCTRL);
@@ -642,7 +642,7 @@ static int lpuart_poll_init(struct uart_port *port) 
	struct lpuart_port *sport = container_of(port,

					struct lpuart_port, port);

	unsigned long flags;

	unsigned char temp;

	u8 temp;



	sport->port.fifosize = 0;
@@ -752,7 +752,7 @@ static inline void lpuart_transmit_buffer(struct lpuart_port *sport) 
static inline void lpuart32_transmit_buffer(struct lpuart_port *sport)

{

	struct tty_port *tport = &sport->port.state->port;

	unsigned long txcnt;

	u32 txcnt;

	unsigned char c;



	if (sport->port.x_char) {
@@ -789,7 +789,7 @@ static void lpuart_start_tx(struct uart_port *port) 
{

	struct lpuart_port *sport = container_of(port,

			struct lpuart_port, port);

	unsigned char temp;

	u8 temp;



	temp = readb(port->membase + UARTCR2);

	writeb(temp | UARTCR2_TIE, port->membase + UARTCR2);
@@ -806,7 +806,7 @@ static void lpuart_start_tx(struct uart_port *port) 
static void lpuart32_start_tx(struct uart_port *port)

{

	struct lpuart_port *sport = container_of(port, struct lpuart_port, port);

	unsigned long temp;

	u32 temp;



	if (sport->lpuart_dma_tx_use) {

		if (!lpuart_stopped_or_empty(port))
@@ -839,8 +839,8 @@ static unsigned int lpuart_tx_empty(struct uart_port *port) 
{

	struct lpuart_port *sport = container_of(port,

			struct lpuart_port, port);

	unsigned char sr1 = readb(port->membase + UARTSR1);

	unsigned char sfifo = readb(port->membase + UARTSFIFO);

	u8 sr1 = readb(port->membase + UARTSR1);

	u8 sfifo = readb(port->membase + UARTSFIFO);



	if (sport->dma_tx_in_progress)

		return 0;
@@ -855,9 +855,9 @@ static unsigned int lpuart32_tx_empty(struct uart_port *port) 
{

	struct lpuart_port *sport = container_of(port,

			struct lpuart_port, port);

	unsigned long stat = lpuart32_read(port, UARTSTAT);

	unsigned long sfifo = lpuart32_read(port, UARTFIFO);

	unsigned long ctrl = lpuart32_read(port, UARTCTRL);

	u32 stat = lpuart32_read(port, UARTSTAT);

	u32 sfifo = lpuart32_read(port, UARTFIFO);

	u32 ctrl = lpuart32_read(port, UARTCTRL);



	if (sport->dma_tx_in_progress)

		return 0;
@@ -884,7 +884,7 @@ static void lpuart_rxint(struct lpuart_port *sport) 
{

	unsigned int flg, ignored = 0, overrun = 0;

	struct tty_port *port = &sport->port.state->port;

	unsigned char rx, sr;

	u8 rx, sr;



	uart_port_lock(&sport->port);
@@ -961,7 +961,7 @@ static void lpuart32_rxint(struct lpuart_port *sport) 
{

	unsigned int flg, ignored = 0;

	struct tty_port *port = &sport->port.state->port;

	unsigned long rx, sr;

	u32 rx, sr;

	bool is_break;



	uart_port_lock(&sport->port);
@@ -1039,7 +1039,7 @@ static void lpuart32_rxint(struct lpuart_port *sport) 
static irqreturn_t lpuart_int(int irq, void *dev_id)

{

	struct lpuart_port *sport = dev_id;

	unsigned char sts;

	u8 sts;



	sts = readb(sport->port.membase + UARTSR1);
@@ -1113,7 +1113,7 @@ static void lpuart_copy_rx_to_tty(struct lpuart_port *sport) 
	int count, copied;



	if (lpuart_is_32(sport)) {

		unsigned long sr = lpuart32_read(&sport->port, UARTSTAT);

		u32 sr = lpuart32_read(&sport->port, UARTSTAT);



		if (sr & (UARTSTAT_PE | UARTSTAT_FE)) {

			/* Clear the error flags */
@@ -1125,10 +1125,10 @@ static void lpuart_copy_rx_to_tty(struct lpuart_port *sport) 
				sport->port.icount.frame++;

		}

	} else {

		unsigned char sr = readb(sport->port.membase + UARTSR1);

		u8 sr = readb(sport->port.membase + UARTSR1);



		if (sr & (UARTSR1_PE | UARTSR1_FE)) {

			unsigned char cr2;

			u8 cr2;



			/* Disable receiver during this operation... */

			cr2 = readb(sport->port.membase + UARTCR2);
@@ -1279,7 +1279,7 @@ static void lpuart32_dma_idleint(struct lpuart_port *sport) 
static irqreturn_t lpuart32_int(int irq, void *dev_id)

{

	struct lpuart_port *sport = dev_id;

	unsigned long sts, rxcount;

	u32 sts, rxcount;



	sts = lpuart32_read(&sport->port, UARTSTAT);

	rxcount = lpuart32_read(&sport->port, UARTWATER);
@@ -1411,12 +1411,12 @@ static inline int lpuart_start_rx_dma(struct lpuart_port *sport) 
	dma_async_issue_pending(chan);



	if (lpuart_is_32(sport)) {

		unsigned long temp = lpuart32_read(&sport->port, UARTBAUD);

		u32 temp = lpuart32_read(&sport->port, UARTBAUD);



		lpuart32_write(&sport->port, temp | UARTBAUD_RDMAE, UARTBAUD);



		if (sport->dma_idle_int) {

			unsigned long ctrl = lpuart32_read(&sport->port, UARTCTRL);

			u32 ctrl = lpuart32_read(&sport->port, UARTCTRL);



			lpuart32_write(&sport->port, ctrl | UARTCTRL_ILIE, UARTCTRL);

		}
@@ -1482,7 +1482,7 @@ static int lpuart32_config_rs485(struct uart_port *port, struct ktermios *termio 
	struct lpuart_port *sport = container_of(port,

			struct lpuart_port, port);



	unsigned long modem = lpuart32_read(&sport->port, UARTMODIR)

	u32 modem = lpuart32_read(&sport->port, UARTMODIR)

				& ~(UARTMODIR_TXRTSPOL | UARTMODIR_TXRTSE);

	u32 ctrl;
@@ -1577,7 +1577,7 @@ static void lpuart32_set_mctrl(struct uart_port *port, unsigned int mctrl) 


static void lpuart_break_ctl(struct uart_port *port, int break_state)

{

	unsigned char temp;

	u8 temp;



	temp = readb(port->membase + UARTCR2) & ~UARTCR2_SBK;
@@ -1589,7 +1589,7 @@ static void lpuart_break_ctl(struct uart_port *port, int break_state) 


static void lpuart32_break_ctl(struct uart_port *port, int break_state)

{

	unsigned long temp;

	u32 temp;



	temp = lpuart32_read(port, UARTCTRL);
@@ -1623,8 +1623,7 @@ static void lpuart32_break_ctl(struct uart_port *port, int break_state) 


static void lpuart_setup_watermark(struct lpuart_port *sport)

{

	unsigned char val, cr2;

	unsigned char cr2_saved;

	u8 val, cr2, cr2_saved;



	cr2 = readb(sport->port.membase + UARTCR2);

	cr2_saved = cr2;
@@ -1657,7 +1656,7 @@ static void lpuart_setup_watermark(struct lpuart_port *sport) 


static void lpuart_setup_watermark_enable(struct lpuart_port *sport)

{

	unsigned char cr2;

	u8 cr2;



	lpuart_setup_watermark(sport);
@@ -1668,8 +1667,7 @@ static void lpuart_setup_watermark_enable(struct lpuart_port *sport) 


static void lpuart32_setup_watermark(struct lpuart_port *sport)

{

	unsigned long val, ctrl;

	unsigned long ctrl_saved;

	u32 val, ctrl, ctrl_saved;



	ctrl = lpuart32_read(&sport->port, UARTCTRL);

	ctrl_saved = ctrl;
@@ -1778,7 +1776,7 @@ static void lpuart_tx_dma_startup(struct lpuart_port *sport) 
static void lpuart_rx_dma_startup(struct lpuart_port *sport)

{

	int ret;

	unsigned char cr3;

	u8 cr3;



	if (uart_console(&sport->port))

		goto err;
@@ -1828,7 +1826,7 @@ static void lpuart_hw_setup(struct lpuart_port *sport) 
static int lpuart_startup(struct uart_port *port)

{

	struct lpuart_port *sport = container_of(port, struct lpuart_port, port);

	unsigned char temp;

	u8 temp;



	/* determine FIFO size and enable FIFO mode */

	temp = readb(sport->port.membase + UARTPFIFO);
@@ -1848,7 +1846,7 @@ static int lpuart_startup(struct uart_port *port) 


static void lpuart32_hw_disable(struct lpuart_port *sport)

{

	unsigned long temp;

	u32 temp;



	temp = lpuart32_read(&sport->port, UARTCTRL);

	temp &= ~(UARTCTRL_RIE | UARTCTRL_ILIE | UARTCTRL_RE |
@@ -1858,7 +1856,7 @@ static void lpuart32_hw_disable(struct lpuart_port *sport) 


static void lpuart32_configure(struct lpuart_port *sport)

{

	unsigned long temp;

	u32 temp;



	temp = lpuart32_read(&sport->port, UARTCTRL);

	if (!sport->lpuart_dma_rx_use)
@@ -1888,7 +1886,7 @@ static void lpuart32_hw_setup(struct lpuart_port *sport) 
static int lpuart32_startup(struct uart_port *port)

{

	struct lpuart_port *sport = container_of(port, struct lpuart_port, port);

	unsigned long temp;

	u32 temp;



	/* determine FIFO size */

	temp = lpuart32_read(&sport->port, UARTFIFO);
@@ -1942,7 +1940,7 @@ static void lpuart_dma_shutdown(struct lpuart_port *sport) 
static void lpuart_shutdown(struct uart_port *port)

{

	struct lpuart_port *sport = container_of(port, struct lpuart_port, port);

	unsigned char temp;

	u8 temp;

	unsigned long flags;



	uart_port_lock_irqsave(port, &flags);
@@ -1962,7 +1960,7 @@ static void lpuart32_shutdown(struct uart_port *port) 
{

	struct lpuart_port *sport =

		container_of(port, struct lpuart_port, port);

	unsigned long temp;

	u32 temp;

	unsigned long flags;



	uart_port_lock_irqsave(port, &flags);
@@ -1998,7 +1996,7 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios, 
{

	struct lpuart_port *sport = container_of(port, struct lpuart_port, port);

	unsigned long flags;

	unsigned char cr1, old_cr1, old_cr2, cr3, cr4, bdh, modem;

	u8 cr1, old_cr1, old_cr2, cr3, cr4, bdh, modem;

	unsigned int  baud;

	unsigned int old_csize = old ? old->c_cflag & CSIZE : CS8;

	unsigned int sbr, brfa;
@@ -2236,7 +2234,7 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios, 
{

	struct lpuart_port *sport = container_of(port, struct lpuart_port, port);

	unsigned long flags;

	unsigned long ctrl, old_ctrl, bd, modem;

	u32 ctrl, old_ctrl, bd, modem;

	unsigned int  baud;

	unsigned int old_csize = old ? old->c_cflag & CSIZE : CS8;
@@ -2503,7 +2501,7 @@ static void 
lpuart_console_write(struct console *co, const char *s, unsigned int count)

{

	struct lpuart_port *sport = lpuart_ports[co->index];

	unsigned char  old_cr2, cr2;

	u8  old_cr2, cr2;

	unsigned long flags;

	int locked = 1;
@@ -2533,7 +2531,7 @@ static void 
lpuart32_console_write(struct console *co, const char *s, unsigned int count)

{

	struct lpuart_port *sport = lpuart_ports[co->index];

	unsigned long  old_cr, cr;

	u32 old_cr, cr;

	unsigned long flags;

	int locked = 1;
@@ -2567,7 +2565,7 @@ static void __init 
lpuart_console_get_options(struct lpuart_port *sport, int *baud,

			   int *parity, int *bits)

{

	unsigned char cr, bdh, bdl, brfa;

	u8 cr, bdh, bdl, brfa;

	unsigned int sbr, uartclk, baud_raw;



	cr = readb(sport->port.membase + UARTCR2);
@@ -2616,7 +2614,7 @@ static void __init 
lpuart32_console_get_options(struct lpuart_port *sport, int *baud,

			   int *parity, int *bits)

{

	unsigned long cr, bd;

	u32 cr, bd;

	unsigned int sbr, uartclk, baud_raw;



	cr = lpuart32_read(&sport->port, UARTCTRL);
@@ -2822,7 +2820,7 @@ static int lpuart_global_reset(struct lpuart_port *sport) 
{

	struct uart_port *port = &sport->port;

	void __iomem *global_addr;

	unsigned long ctrl, bd;

	u32 ctrl, bd;

	unsigned int val = 0;

	int ret;
@@ -3028,7 +3026,7 @@ static int lpuart_runtime_resume(struct device *dev) 


static void serial_lpuart_enable_wakeup(struct lpuart_port *sport, bool on)

{

	unsigned int val, baud;

	u32 val, baud;



	if (lpuart_is_32(sport)) {

		val = lpuart32_read(&sport->port, UARTCTRL);
@@ -3093,7 +3091,7 @@ static int lpuart_suspend_noirq(struct device *dev) 
static int lpuart_resume_noirq(struct device *dev)

{

	struct lpuart_port *sport = dev_get_drvdata(dev);

	unsigned int val;

	u32 val;



	pinctrl_pm_select_default_state(dev);
@@ -3113,7 +3111,8 @@ static int lpuart_resume_noirq(struct device *dev) 
static int lpuart_suspend(struct device *dev)

{

	struct lpuart_port *sport = dev_get_drvdata(dev);

	unsigned long temp, flags;

	u32 temp;

	unsigned long flags;



	uart_suspend_port(&lpuart_reg, &sport->port);