diff mbox series

[28/44] serial: samsung_tty: Use uart_xmit_advance()

Message ID	20221019091151.6692-29-ilpo.jarvinen@linux.intel.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com> To: linux-serial@vger.kernel.org, Greg KH <gregkh@linuxfoundation.org>, Jiri Slaby <jirislaby@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>, Alim Akhtar <alim.akhtar@samsung.com>, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, =?utf-8?q?Ilpo_J?= =?utf-8?q?=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com> Subject: [PATCH 28/44] serial: samsung_tty: Use uart_xmit_advance() Date: Wed, 19 Oct 2022 12:11:35 +0300 Message-Id: <20221019091151.6692-29-ilpo.jarvinen@linux.intel.com> In-Reply-To: <20221019091151.6692-1-ilpo.jarvinen@linux.intel.com> References: <20221019091151.6692-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	serial: Convert drivers to use uart_xmit_advance() \| [00/44] serial: Convert drivers to use uart_xmit_advance() [01/44] serial: dz: Use uart_xmit_advance() [02/44] serial: men_z135_uart: Use uart_xmit_advance() [03/44] serial: msm: Use uart_xmit_advance() [04/44] serial: pch_uart: Use uart_xmit_advance() [05/44] serial: sc16is7xx: Use uart_xmit_advance() [06/44] serial: 8250_bcm7271: Use uart_xmit_advance() [07/44] serial: 8250: Use uart_xmit_advance() [08/44] serial: pl011: Use uart_xmit_advance() [09/44] serial: ar933x: Use uart_xmit_advance() [10/44] serial: arc: Use uart_xmit_advance() [11/44] serial: atmel: Use uart_xmit_advance() [12/44] serial: clps711x: Use uart_xmit_advance() [13/44] serial: cpm_uart: Use uart_xmit_advance() [14/44] serial: digicolor: Use uart_xmit_advance() [15/44] serial: linflexuart: Use uart_xmit_advance() [16/44] serial: fsl_lpuart: Use uart_xmit_advance() [17/44] serial: imx: Use uart_xmit_advance() [18/44] serial: ip22zilog: Use uart_xmit_advance() [19/44] serial: liteuart: Use uart_xmit_advance() [20/44] serial: max3100: Use uart_xmit_advance() [21/44] serial: max310x: Use uart_xmit_advance() [22/44] serial: meson: Use uart_xmit_advance() [23/44] serial: milbeaut_usio: Use uart_xmit_advance() [24/44] serial: mvebu-uart: Use uart_xmit_advance() [25/44] serial: pic32: Use uart_xmit_advance() [26/44] serial: pmac_zilog: Use uart_xmit_advance() [27/44] serial: rda: Use uart_xmit_advance() [28/44] serial: samsung_tty: Use uart_xmit_advance() [29/44] serial: sb1250-duart: Use uart_xmit_advance() [30/44] serial: sccnxp: Use uart_xmit_advance() [31/44] serial: tegra: Use uart_xmit_advance() [32/44] serial: sh-sci: Use uart_xmit_advance() [33/44] serial: sprd: Use uart_xmit_advance() [34/44] serial: stm32: Use uart_xmit_advance() [35/44] serial: sunhv: Use uart_xmit_advance() [36/44] serial: sunplus-uart: Use uart_xmit_advance() [37/44] serial: sunsab: Use uart_xmit_advance() [38/44] serial: sunsu: Use uart_xmit_advance() [39/44] serial: sunzilog: Use uart_xmit_advance() [40/44] serial: timbuart: Use uart_xmit_advance() [41/44] serial: uartlite: Use uart_xmit_advance() [42/44] serial: ucc_uart: Use uart_xmit_advance() [43/44] serial: xuartps: Use uart_xmit_advance() [44/44] serial: zs: Use uart_xmit_advance()

Commit Message

Ilpo Järvinen Oct. 19, 2022, 9:11 a.m. UTC

  Take advantage of the new uart_xmit_advance() helper.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
 drivers/tty/serial/samsung_tty.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Comments

Sam Protsenko Oct. 21, 2022, 11:48 a.m. UTC | #1

On Wed, 19 Oct 2022 at 11:35, Ilpo Järvinen
<ilpo.jarvinen@linux.intel.com> wrote:
>
> Take advantage of the new uart_xmit_advance() helper.
>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> ---

Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>

>  drivers/tty/serial/samsung_tty.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c
> index 77d1363029f5..7e34361a1085 100644
> --- a/drivers/tty/serial/samsung_tty.c
> +++ b/drivers/tty/serial/samsung_tty.c
> @@ -288,7 +288,6 @@ static void s3c24xx_serial_stop_tx(struct uart_port *port)
>  {
>         struct s3c24xx_uart_port *ourport = to_ourport(port);
>         struct s3c24xx_uart_dma *dma = ourport->dma;
> -       struct circ_buf *xmit = &port->state->xmit;
>         struct dma_tx_state state;
>         int count;
>
> @@ -316,8 +315,7 @@ static void s3c24xx_serial_stop_tx(struct uart_port *port)
>                                         DMA_TO_DEVICE);
>                 async_tx_ack(dma->tx_desc);
>                 count = dma->tx_bytes_requested - state.residue;
> -               xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1);
> -               port->icount.tx += count;
> +               uart_xmit_advance(port, count);
>         }
>
>         ourport->tx_enabled = 0;
> @@ -351,8 +349,7 @@ static void s3c24xx_serial_tx_dma_complete(void *args)
>
>         spin_lock_irqsave(&port->lock, flags);
>
> -       xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1);
> -       port->icount.tx += count;
> +       uart_xmit_advance(port, count);
>         ourport->tx_in_progress = 0;
>
>         if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
> @@ -916,8 +913,7 @@ static void s3c24xx_serial_tx_chars(struct s3c24xx_uart_port *ourport)
>                         break;
>
>                 wr_reg(port, S3C2410_UTXH, xmit->buf[xmit->tail]);
> -               xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
> -               port->icount.tx++;
> +               uart_xmit_advance(port, 1);
>                 count--;
>         }
>
> --
> 2.30.2
>

diff mbox series

Patch

diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c
index 77d1363029f5..7e34361a1085 100644
--- a/drivers/tty/serial/samsung_tty.c
+++ b/drivers/tty/serial/samsung_tty.c
@@ -288,7 +288,6 @@  static void s3c24xx_serial_stop_tx(struct uart_port *port)
 {
 	struct s3c24xx_uart_port *ourport = to_ourport(port);
 	struct s3c24xx_uart_dma *dma = ourport->dma;
-	struct circ_buf *xmit = &port->state->xmit;
 	struct dma_tx_state state;
 	int count;
 
@@ -316,8 +315,7 @@  static void s3c24xx_serial_stop_tx(struct uart_port *port)
 					DMA_TO_DEVICE);
 		async_tx_ack(dma->tx_desc);
 		count = dma->tx_bytes_requested - state.residue;
-		xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1);
-		port->icount.tx += count;
+		uart_xmit_advance(port, count);
 	}
 
 	ourport->tx_enabled = 0;
@@ -351,8 +349,7 @@  static void s3c24xx_serial_tx_dma_complete(void *args)
 
 	spin_lock_irqsave(&port->lock, flags);
 
-	xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1);
-	port->icount.tx += count;
+	uart_xmit_advance(port, count);
 	ourport->tx_in_progress = 0;
 
 	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
@@ -916,8 +913,7 @@  static void s3c24xx_serial_tx_chars(struct s3c24xx_uart_port *ourport)
 			break;
 
 		wr_reg(port, S3C2410_UTXH, xmit->buf[xmit->tail]);
-		xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-		port->icount.tx++;
+		uart_xmit_advance(port, 1);
 		count--;
 	}