From: Grant Likely <grant.likely@secretlab.ca>
To: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org, robherring2@gmail.com,
claudio@evidence.eu.com, jesper.nilsson@axis.com,
alan@lxorguk.ukuu.org.uk, linux-kernel@vger.kernel.org,
linux-serial@vger.kernel.org
Subject: Re: [PATCH v2 3/5] tty/serial: atmel_serial: whitespace and braces modifications
Date: Wed, 12 Oct 2011 19:02:48 -0600 [thread overview]
Message-ID: <20111013010248.GN14042@ponder.secretlab.ca> (raw)
In-Reply-To: <e4c59e6f5ee33c1be57085ac0840b53322526367.1318433947.git.nicolas.ferre@atmel.com>
On Wed, Oct 12, 2011 at 06:06:58PM +0200, Nicolas Ferre wrote:
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
> ---
> drivers/tty/serial/atmel_serial.c | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
> index a507daa..bb72354 100644
> --- a/drivers/tty/serial/atmel_serial.c
> +++ b/drivers/tty/serial/atmel_serial.c
> @@ -1433,10 +1433,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
>
> memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring));
>
> - if (pdata->regs)
> + if (pdata->regs) {
> /* Already mapped by setup code */
> port->membase = pdata->regs;
> - else {
> + } else {
> port->flags |= UPF_IOREMAP;
> port->membase = NULL;
> }
> @@ -1450,9 +1450,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
> /* only enable clock when USART is in use */
> }
>
> - atmel_port->use_dma_rx = pdata->use_dma_rx;
> - atmel_port->use_dma_tx = pdata->use_dma_tx;
> + atmel_port->use_dma_rx = pdata->use_dma_rx;
> + atmel_port->use_dma_tx = pdata->use_dma_tx;
> atmel_port->rs485 = pdata->rs485;
> +
> /* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */
> if (atmel_port->rs485.flags & SER_RS485_ENABLED)
> atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;
> --
> 1.7.5.4
>
next prev parent reply other threads:[~2011-10-13 2:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-12 16:06 [PATCH v2 0/5] tty/serial: atmel_serial: Device Tree support Nicolas Ferre
2011-10-12 16:06 ` [PATCH v2 1/5] tty/serial: RS485 bindings for device tree Nicolas Ferre
2011-10-12 16:06 ` [PATCH v2 3/5] tty/serial: atmel_serial: whitespace and braces modifications Nicolas Ferre
2011-10-13 1:02 ` Grant Likely [this message]
[not found] ` <37a19e194d02144aecd24f284f5e43979643a3c3.1318433947.git.nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
[not found] ` <1318435620-7481-1-git-send-email-nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2011-10-12 16:06 ` [PATCH v2 2/5] tty/serial: atmel_serial: change platform_data variable name Nicolas Ferre
[not found] ` <58d65421a85737b7a25b967da09c3f564fc49be7.1318433947.git.nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2011-10-13 1:01 ` Grant Likely
2011-10-12 16:06 ` [PATCH v2 4/5] tty/serial: atmel_serial: auto-enumerate ports Nicolas Ferre
2011-10-13 1:03 ` Grant Likely
2011-10-12 16:07 ` [PATCH v2 5/5] tty/serial: atmel_serial: add device tree support Nicolas Ferre
[not found] ` <46ce59e472d36715d8bed57570d2b7747323f4d4.1318433947.git.nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2011-10-13 1:04 ` Grant Likely
2011-10-13 1:02 ` [PATCH v2 1/5] tty/serial: RS485 bindings for device tree Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111013010248.GN14042@ponder.secretlab.ca \
--to=grant.likely@secretlab.ca \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=claudio@evidence.eu.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=jesper.nilsson@axis.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=robherring2@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).