leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial: samsung: Replace rd_regb/wr_regb with rd_reg/wr_reg

Browse Source 
This patch change the name of macro for general usage.

Signed-off-by: Hyunki Koo <hyunki00.koo@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested on Odroid HC1 (Exynos5422):
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20200506080242.18623-1-hyunki00.koo@samsung.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hyunki Koo 2020-05-06 17:02:38 +09:00 committed by Greg Kroah-Hartman
parent 0a64f38037
commit 8fba6c0c4c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/tty/serial/samsung_tty.c
View File

@ -154,10 +154,10 @@ struct s3c24xx_uart_port {
#define portaddrl(port, reg) \ #define portaddrl(port, reg) \
((unsigned long *)(unsigned long)((port)->membase + (reg))) ((unsigned long *)(unsigned long)((port)->membase + (reg)))
#define rd_regb(port, reg) (readb_relaxed(portaddr(port, reg))) #define rd_reg(port, reg) (readb_relaxed(portaddr(port, reg)))
#define rd_regl(port, reg) (readl_relaxed(portaddr(port, reg))) #define rd_regl(port, reg) (readl_relaxed(portaddr(port, reg)))
#define wr_regb(port, reg, val) writeb_relaxed(val, portaddr(port, reg)) #define wr_reg(port, reg, val) writeb_relaxed(val, portaddr(port, reg))
#define wr_regl(port, reg, val) writel_relaxed(val, portaddr(port, reg)) #define wr_regl(port, reg, val) writel_relaxed(val, portaddr(port, reg))
/* Byte-order aware bit setting/clearing functions. */ /* Byte-order aware bit setting/clearing functions. */
@ -714,7 +714,7 @@ static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport)
fifocnt--; fifocnt--;
uerstat = rd_regl(port, S3C2410_UERSTAT); uerstat = rd_regl(port, S3C2410_UERSTAT);
ch = rd_regb(port, S3C2410_URXH); ch = rd_reg(port, S3C2410_URXH);
if (port->flags & UPF_CONS_FLOW) { if (port->flags & UPF_CONS_FLOW) {
int txe = s3c24xx_serial_txempty_nofifo(port); int txe = s3c24xx_serial_txempty_nofifo(port);
@ -826,7 +826,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
} }
if (port->x_char) { if (port->x_char) {
wr_regb(port, S3C2410_UTXH, port->x_char); wr_reg(port, S3C2410_UTXH, port->x_char);
port->icount.tx++; port->icount.tx++;
port->x_char = 0; port->x_char = 0;
goto out; goto out;
@ -852,7 +852,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
if (rd_regl(port, S3C2410_UFSTAT) & ourport->info->tx_fifofull) if (rd_regl(port, S3C2410_UFSTAT) & ourport->info->tx_fifofull)
break; break;
wr_regb(port, S3C2410_UTXH, xmit->buf[xmit->tail]); wr_reg(port, S3C2410_UTXH, xmit->buf[xmit->tail]);
xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
port->icount.tx++; port->icount.tx++;
count--; count--;
@ -916,7 +916,7 @@ static unsigned int s3c24xx_serial_tx_empty(struct uart_port *port)
/* no modem control lines */ /* no modem control lines */
static unsigned int s3c24xx_serial_get_mctrl(struct uart_port *port) static unsigned int s3c24xx_serial_get_mctrl(struct uart_port *port)
{ {
unsigned int umstat = rd_regb(port, S3C2410_UMSTAT); unsigned int umstat = rd_reg(port, S3C2410_UMSTAT);
if (umstat & S3C2410_UMSTAT_CTS) if (umstat & S3C2410_UMSTAT_CTS)
return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS; return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
@ -2185,7 +2185,7 @@ static int s3c24xx_serial_get_poll_char(struct uart_port *port)
if (s3c24xx_serial_rx_fifocnt(ourport, ufstat) == 0) if (s3c24xx_serial_rx_fifocnt(ourport, ufstat) == 0)
return NO_POLL_CHAR; return NO_POLL_CHAR;
return rd_regb(port, S3C2410_URXH); return rd_reg(port, S3C2410_URXH);
} }
static void s3c24xx_serial_put_poll_char(struct uart_port *port, static void s3c24xx_serial_put_poll_char(struct uart_port *port,
@ -2200,7 +2200,7 @@ static void s3c24xx_serial_put_poll_char(struct uart_port *port,
while (!s3c24xx_serial_console_txrdy(port, ufcon)) while (!s3c24xx_serial_console_txrdy(port, ufcon))
cpu_relax(); cpu_relax();
wr_regb(port, S3C2410_UTXH, c); wr_reg(port, S3C2410_UTXH, c);
} }
#endif /* CONFIG_CONSOLE_POLL */ #endif /* CONFIG_CONSOLE_POLL */
@ -2212,7 +2212,7 @@ s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
while (!s3c24xx_serial_console_txrdy(port, ufcon)) while (!s3c24xx_serial_console_txrdy(port, ufcon))
cpu_relax(); cpu_relax();
wr_regb(port, S3C2410_UTXH, ch); wr_reg(port, S3C2410_UTXH, ch);
} }
static void static void