From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Ferre Subject: Re: [PATCH 5/5] tty/serial: at91: fix typo and indentation Date: Fri, 9 Jan 2015 16:41:26 +0100 Message-ID: <54AFF6A6.4060204@atmel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Cyrille Pitchen , gregkh@linuxfoundation.org, wenyou.yang@atmel.com, ludovic.desroches@atmel.com, leilei.zhao@atmel.com, voice.shen@atmel.com, josh.wu@atmel.com, linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: linux-serial@vger.kernel.org Le 09/12/2014 14:31, Cyrille Pitchen a =E9crit : > Signed-off-by: Cyrille Pitchen Acked-by: Nicolas Ferre thanks Cyrille. Bye. > --- > drivers/tty/serial/atmel_serial.c | 40 +++++++++++++++++++++--------= ---------- > 1 file changed, 22 insertions(+), 18 deletions(-) >=20 > diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/a= tmel_serial.c > index 9e0c636..846552b 100644 > --- a/drivers/tty/serial/atmel_serial.c > +++ b/drivers/tty/serial/atmel_serial.c > @@ -738,7 +738,11 @@ static void atmel_complete_tx_dma(void *arg) > if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) > uart_write_wakeup(port); > =20 > - /* Do we really need this? */ > + /* > + * xmit is a circular buffer so, if we have just send data from > + * xmit->tail to the end of xmit->buf, now we have to transmit the > + * remaining data from the beginning of xmit->buf to xmit->head. > + */ > if (!uart_circ_empty(xmit)) > tasklet_schedule(&atmel_port->tasklet); > =20 > @@ -797,11 +801,11 @@ static void atmel_tx_dma(struct uart_port *port= ) > BUG_ON(!sg_dma_len(sg)); > =20 > desc =3D dmaengine_prep_slave_sg(chan, > - sg, > - 1, > - DMA_MEM_TO_DEV, > - DMA_PREP_INTERRUPT | > - DMA_CTRL_ACK); > + sg, > + 1, > + DMA_MEM_TO_DEV, > + DMA_PREP_INTERRUPT | > + DMA_CTRL_ACK); > if (!desc) { > dev_err(port->dev, "Failed to send via dma!\n"); > return; > @@ -1025,13 +1029,13 @@ static int atmel_prepare_rx_dma(struct uart_p= ort *port) > /* UART circular rx buffer is an aligned page. */ > BUG_ON((int)port->state->xmit.buf & ~PAGE_MASK); > sg_set_page(&atmel_port->sg_rx, > - virt_to_page(ring->buf), > - ATMEL_SERIAL_RINGSIZE, > - (int)ring->buf & ~PAGE_MASK); > - nent =3D dma_map_sg(port->dev, > - &atmel_port->sg_rx, > - 1, > - DMA_FROM_DEVICE); > + virt_to_page(ring->buf), > + ATMEL_SERIAL_RINGSIZE, > + (int)ring->buf & ~PAGE_MASK); > + nent =3D dma_map_sg(port->dev, > + &atmel_port->sg_rx, > + 1, > + DMA_FROM_DEVICE); > =20 > if (!nent) { > dev_dbg(port->dev, "need to release resource of dma\n"); > @@ -1060,11 +1064,11 @@ static int atmel_prepare_rx_dma(struct uart_p= ort *port) > * each one is half ring buffer size > */ > desc =3D dmaengine_prep_dma_cyclic(atmel_port->chan_rx, > - sg_dma_address(&atmel_port->sg_rx), > - sg_dma_len(&atmel_port->sg_rx), > - sg_dma_len(&atmel_port->sg_rx)/2, > - DMA_DEV_TO_MEM, > - DMA_PREP_INTERRUPT); > + sg_dma_address(&atmel_port->sg_rx), > + sg_dma_len(&atmel_port->sg_rx), > + sg_dma_len(&atmel_port->sg_rx)/2, > + DMA_DEV_TO_MEM, > + DMA_PREP_INTERRUPT); > desc->callback =3D atmel_complete_rx_dma; > desc->callback_param =3D port; > atmel_port->desc_rx =3D desc; >=20 --=20 Nicolas Ferre From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Fri, 9 Jan 2015 16:41:26 +0100 Subject: [PATCH 5/5] tty/serial: at91: fix typo and indentation In-Reply-To: References: Message-ID: <54AFF6A6.4060204@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Le 09/12/2014 14:31, Cyrille Pitchen a ?crit : > Signed-off-by: Cyrille Pitchen Acked-by: Nicolas Ferre thanks Cyrille. Bye. > --- > drivers/tty/serial/atmel_serial.c | 40 +++++++++++++++++++++------------------ > 1 file changed, 22 insertions(+), 18 deletions(-) > > diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c > index 9e0c636..846552b 100644 > --- a/drivers/tty/serial/atmel_serial.c > +++ b/drivers/tty/serial/atmel_serial.c > @@ -738,7 +738,11 @@ static void atmel_complete_tx_dma(void *arg) > if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) > uart_write_wakeup(port); > > - /* Do we really need this? */ > + /* > + * xmit is a circular buffer so, if we have just send data from > + * xmit->tail to the end of xmit->buf, now we have to transmit the > + * remaining data from the beginning of xmit->buf to xmit->head. > + */ > if (!uart_circ_empty(xmit)) > tasklet_schedule(&atmel_port->tasklet); > > @@ -797,11 +801,11 @@ static void atmel_tx_dma(struct uart_port *port) > BUG_ON(!sg_dma_len(sg)); > > desc = dmaengine_prep_slave_sg(chan, > - sg, > - 1, > - DMA_MEM_TO_DEV, > - DMA_PREP_INTERRUPT | > - DMA_CTRL_ACK); > + sg, > + 1, > + DMA_MEM_TO_DEV, > + DMA_PREP_INTERRUPT | > + DMA_CTRL_ACK); > if (!desc) { > dev_err(port->dev, "Failed to send via dma!\n"); > return; > @@ -1025,13 +1029,13 @@ static int atmel_prepare_rx_dma(struct uart_port *port) > /* UART circular rx buffer is an aligned page. */ > BUG_ON((int)port->state->xmit.buf & ~PAGE_MASK); > sg_set_page(&atmel_port->sg_rx, > - virt_to_page(ring->buf), > - ATMEL_SERIAL_RINGSIZE, > - (int)ring->buf & ~PAGE_MASK); > - nent = dma_map_sg(port->dev, > - &atmel_port->sg_rx, > - 1, > - DMA_FROM_DEVICE); > + virt_to_page(ring->buf), > + ATMEL_SERIAL_RINGSIZE, > + (int)ring->buf & ~PAGE_MASK); > + nent = dma_map_sg(port->dev, > + &atmel_port->sg_rx, > + 1, > + DMA_FROM_DEVICE); > > if (!nent) { > dev_dbg(port->dev, "need to release resource of dma\n"); > @@ -1060,11 +1064,11 @@ static int atmel_prepare_rx_dma(struct uart_port *port) > * each one is half ring buffer size > */ > desc = dmaengine_prep_dma_cyclic(atmel_port->chan_rx, > - sg_dma_address(&atmel_port->sg_rx), > - sg_dma_len(&atmel_port->sg_rx), > - sg_dma_len(&atmel_port->sg_rx)/2, > - DMA_DEV_TO_MEM, > - DMA_PREP_INTERRUPT); > + sg_dma_address(&atmel_port->sg_rx), > + sg_dma_len(&atmel_port->sg_rx), > + sg_dma_len(&atmel_port->sg_rx)/2, > + DMA_DEV_TO_MEM, > + DMA_PREP_INTERRUPT); > desc->callback = atmel_complete_rx_dma; > desc->callback_param = port; > atmel_port->desc_rx = desc; > -- Nicolas Ferre From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933038AbbAIPlb (ORCPT ); Fri, 9 Jan 2015 10:41:31 -0500 Received: from eusmtp01.atmel.com ([212.144.249.242]:37909 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932762AbbAIPl3 (ORCPT ); Fri, 9 Jan 2015 10:41:29 -0500 Message-ID: <54AFF6A6.4060204@atmel.com> Date: Fri, 9 Jan 2015 16:41:26 +0100 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Cyrille Pitchen , , , , , , , CC: , Subject: Re: [PATCH 5/5] tty/serial: at91: fix typo and indentation References: In-Reply-To: Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 09/12/2014 14:31, Cyrille Pitchen a écrit : > Signed-off-by: Cyrille Pitchen Acked-by: Nicolas Ferre thanks Cyrille. Bye. > --- > drivers/tty/serial/atmel_serial.c | 40 +++++++++++++++++++++------------------ > 1 file changed, 22 insertions(+), 18 deletions(-) > > diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c > index 9e0c636..846552b 100644 > --- a/drivers/tty/serial/atmel_serial.c > +++ b/drivers/tty/serial/atmel_serial.c > @@ -738,7 +738,11 @@ static void atmel_complete_tx_dma(void *arg) > if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) > uart_write_wakeup(port); > > - /* Do we really need this? */ > + /* > + * xmit is a circular buffer so, if we have just send data from > + * xmit->tail to the end of xmit->buf, now we have to transmit the > + * remaining data from the beginning of xmit->buf to xmit->head. > + */ > if (!uart_circ_empty(xmit)) > tasklet_schedule(&atmel_port->tasklet); > > @@ -797,11 +801,11 @@ static void atmel_tx_dma(struct uart_port *port) > BUG_ON(!sg_dma_len(sg)); > > desc = dmaengine_prep_slave_sg(chan, > - sg, > - 1, > - DMA_MEM_TO_DEV, > - DMA_PREP_INTERRUPT | > - DMA_CTRL_ACK); > + sg, > + 1, > + DMA_MEM_TO_DEV, > + DMA_PREP_INTERRUPT | > + DMA_CTRL_ACK); > if (!desc) { > dev_err(port->dev, "Failed to send via dma!\n"); > return; > @@ -1025,13 +1029,13 @@ static int atmel_prepare_rx_dma(struct uart_port *port) > /* UART circular rx buffer is an aligned page. */ > BUG_ON((int)port->state->xmit.buf & ~PAGE_MASK); > sg_set_page(&atmel_port->sg_rx, > - virt_to_page(ring->buf), > - ATMEL_SERIAL_RINGSIZE, > - (int)ring->buf & ~PAGE_MASK); > - nent = dma_map_sg(port->dev, > - &atmel_port->sg_rx, > - 1, > - DMA_FROM_DEVICE); > + virt_to_page(ring->buf), > + ATMEL_SERIAL_RINGSIZE, > + (int)ring->buf & ~PAGE_MASK); > + nent = dma_map_sg(port->dev, > + &atmel_port->sg_rx, > + 1, > + DMA_FROM_DEVICE); > > if (!nent) { > dev_dbg(port->dev, "need to release resource of dma\n"); > @@ -1060,11 +1064,11 @@ static int atmel_prepare_rx_dma(struct uart_port *port) > * each one is half ring buffer size > */ > desc = dmaengine_prep_dma_cyclic(atmel_port->chan_rx, > - sg_dma_address(&atmel_port->sg_rx), > - sg_dma_len(&atmel_port->sg_rx), > - sg_dma_len(&atmel_port->sg_rx)/2, > - DMA_DEV_TO_MEM, > - DMA_PREP_INTERRUPT); > + sg_dma_address(&atmel_port->sg_rx), > + sg_dma_len(&atmel_port->sg_rx), > + sg_dma_len(&atmel_port->sg_rx)/2, > + DMA_DEV_TO_MEM, > + DMA_PREP_INTERRUPT); > desc->callback = atmel_complete_rx_dma; > desc->callback_param = port; > atmel_port->desc_rx = desc; > -- Nicolas Ferre