Message ID | 20200420013300.17249-1-hyunki00.koo@samsung.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | [v8,1/3] serial: samsung: Replace rd_regb/wr_regb with rd_reg/wr_reg | expand |
On Mon, Apr 20, 2020 at 10:32:56AM +0900, Hyunki Koo wrote: > This patch change the name of macro for general usage. > > Signed-off-by: Hyunki Koo <hyunki00.koo@samsung.com> This patch series creates the following build error, which is not allowed: CC [M] drivers/tty/serial/samsung_tty.o drivers/tty/serial/samsung_tty.c:186:13: warning: ‘wr_reg_barrier’ defined but not used [-Wunused-function] 186 | static void wr_reg_barrier(struct uart_port *port, u32 reg, u32 val) | ^~~~~~~~~~~~~~ Please fix up and resend. Always make sure you keep the reviewed-by tags from others as well. greg k-h
On Tuesday, May 5, 2020 at 2020 11:23:00 PM +0900, Greg Kroah-Hartman wrote: > On Mon, Apr 20, 2020 at 10:32:56AM +0900, Hyunki Koo wrote: > > This patch change the name of macro for general usage. > > > > Signed-off-by: Hyunki Koo <hyunki00.koo@samsung.com> > > This patch series creates the following build error, which is not > allowed: > > CC [M] drivers/tty/serial/samsung_tty.o > drivers/tty/serial/samsung_tty.c:186:13: warning: ‘wr_reg_barrier’ > defined but not used [-Wunused-function] > 186 | static void wr_reg_barrier(struct uart_port *port, u32 reg, u32 val) > | ^~~~~~~~~~~~~~ > > Please fix up and resend. Always make sure you keep the reviewed-by > tags from others as well. > > greg k-h I tested on latest kernel today one more time, there is no error and warning on my side, not only patch 1/3 and patch 3/3 Line 1735: CC drivers/tty/serial/samsung_tty.o Line 343: CC drivers/tty/serial/samsung_tty.o wr_reg_barrier is not defined in patch 1/3, and wr_reg_barrier is define and used in patch3/3 it might be no warning.
On Wed, May 06, 2020 at 08:30:46AM +0900, Hyunki Koo wrote: > On Tuesday, May 5, 2020 at 2020 11:23:00 PM +0900, Greg Kroah-Hartman wrote: > > On Mon, Apr 20, 2020 at 10:32:56AM +0900, Hyunki Koo wrote: > > > This patch change the name of macro for general usage. > > > > > > Signed-off-by: Hyunki Koo <hyunki00.koo@samsung.com> > > > > This patch series creates the following build error, which is not > > allowed: > > > > CC [M] drivers/tty/serial/samsung_tty.o > > drivers/tty/serial/samsung_tty.c:186:13: warning: ‘wr_reg_barrier’ > > defined but not used [-Wunused-function] > > 186 | static void wr_reg_barrier(struct uart_port *port, u32 reg, u32 val) > > | ^~~~~~~~~~~~~~ > > > > Please fix up and resend. Always make sure you keep the reviewed-by > > tags from others as well. > > > > greg k-h > > I tested on latest kernel today one more time, there is no error and warning on my side, not only patch 1/3 and patch 3/3 > Line 1735: CC drivers/tty/serial/samsung_tty.o > Line 343: CC drivers/tty/serial/samsung_tty.o > > wr_reg_barrier is not defined in patch 1/3, > and wr_reg_barrier is define and used in patch3/3 > it might be no warning. After I apply this series, I got the above build warning on my normal x86 system, so I can not take the patches. Please fix up and resend. greg k-h
On Tuesday, May 5, 2020 at 2020 03:31:00 PM +0900, Greg Kroah-Hartman > On Wed, May 06, 2020 at 08:30:46AM +0900, Hyunki Koo wrote: > > On Tuesday, May 5, 2020 at 2020 11:23:00 PM +0900, Greg Kroah-Hartman > Hartman wrote: > > > On Mon, Apr 20, 2020 at 10:32:56AM +0900, Hyunki Koo wrote: > > > > This patch change the name of macro for general usage. > > > > > > > > Signed-off-by: Hyunki Koo <hyunki00.koo@samsung.com> > > > > > > This patch series creates the following build error, which is not > > > allowed: > > > > > > CC [M] drivers/tty/serial/samsung_tty.o > > > drivers/tty/serial/samsung_tty.c:186:13: warning: ‘wr_reg_barrier’ > > > defined but not used [-Wunused-function] > > > 186 | static void wr_reg_barrier(struct uart_port *port, u32 reg, u32 > val) > > > | ^~~~~~~~~~~~~~ > > > > > > Please fix up and resend. Always make sure you keep the reviewed-by > > > tags from others as well. > > > > > > greg k-h > > > > I tested on latest kernel today one more time, there is no error and > warning on my side, not only patch 1/3 and patch 3/3 > > Line 1735: CC drivers/tty/serial/samsung_tty.o > > Line 343: CC drivers/tty/serial/samsung_tty.o > > > > wr_reg_barrier is not defined in patch 1/3, and wr_reg_barrier is > > define and used in patch3/3 it might be no warning. > > After I apply this series, I got the above build warning on my normal > x86 system, so I can not take the patches. Please fix up and resend. > > greg k-h I'm so sorry, There is an warning if CONFIG_SERIAL_SAMSUNG_CONSOLE is not enabled. I've fix the patch and resend Thank you in advance.
diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c index 73f951d65b93..326b0164609c 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -154,10 +154,10 @@ struct s3c24xx_uart_port { #define portaddrl(port, 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 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)) /* Byte-order aware bit setting/clearing functions. */ @@ -714,7 +714,7 @@ static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport) fifocnt--; uerstat = rd_regl(port, S3C2410_UERSTAT); - ch = rd_regb(port, S3C2410_URXH); + ch = rd_reg(port, S3C2410_URXH); if (port->flags & UPF_CONS_FLOW) { 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) { - wr_regb(port, S3C2410_UTXH, port->x_char); + wr_reg(port, S3C2410_UTXH, port->x_char); port->icount.tx++; port->x_char = 0; 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) 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); port->icount.tx++; count--; @@ -916,7 +916,7 @@ static unsigned int s3c24xx_serial_tx_empty(struct uart_port *port) /* no modem control lines */ 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) 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) 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, @@ -2200,7 +2200,7 @@ static void s3c24xx_serial_put_poll_char(struct uart_port *port, while (!s3c24xx_serial_console_txrdy(port, ufcon)) cpu_relax(); - wr_regb(port, S3C2410_UTXH, c); + wr_reg(port, S3C2410_UTXH, c); } #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)) cpu_relax(); - wr_regb(port, S3C2410_UTXH, ch); + wr_reg(port, S3C2410_UTXH, ch); } static void
This patch change the name of macro for general usage. Signed-off-by: Hyunki Koo <hyunki00.koo@samsung.com> --- drivers/tty/serial/samsung_tty.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)