All of lore.kernel.org
 help / color / mirror / Atom feed
From: Soren Brinkmann <soren.brinkmann@xilinx.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jslaby@suse.com>
Cc: Michal Simek <michal.simek@xilinx.com>,
	<linux-serial@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>,
	"Soren Brinkmann" <soren.brinkmann@xilinx.com>
Subject: [PATH RESEND v2 01/10] tty: xuartps: Beautify read-modify writes
Date: Thu, 19 Nov 2015 12:02:15 -0800	[thread overview]
Message-ID: <1447963344-16266-2-git-send-email-soren.brinkmann@xilinx.com> (raw)
In-Reply-To: <1447963344-16266-1-git-send-email-soren.brinkmann@xilinx.com>

Non-functional, formatting changes to ease reading the code.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
 drivers/tty/serial/xilinx_uartps.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 009e0dbc12d2..50d4082d2354 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -515,12 +515,14 @@ static void cdns_uart_start_tx(struct uart_port *port)
 	if (uart_circ_empty(&port->state->xmit) || uart_tx_stopped(port))
 		return;
 
-	status = readl(port->membase + CDNS_UART_CR_OFFSET);
-	/* Set the TX enable bit and clear the TX disable bit to enable the
+	/*
+	 * Set the TX enable bit and clear the TX disable bit to enable the
 	 * transmitter.
 	 */
-	writel((status & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN,
-			port->membase + CDNS_UART_CR_OFFSET);
+	status = readl(port->membase + CDNS_UART_CR_OFFSET);
+	status &= ~CDNS_UART_CR_TX_DIS;
+	status |= CDNS_UART_CR_TX_EN;
+	writel(status, port->membase + CDNS_UART_CR_OFFSET);
 
 	while (numbytes-- && ((readl(port->membase + CDNS_UART_SR_OFFSET) &
 				CDNS_UART_SR_TXFULL)) != CDNS_UART_SR_TXFULL) {
@@ -1123,8 +1125,9 @@ static void cdns_uart_console_write(struct console *co, const char *s,
 	 * clear the TX disable bit to enable the transmitter.
 	 */
 	ctrl = readl(port->membase + CDNS_UART_CR_OFFSET);
-	writel((ctrl & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN,
-			port->membase + CDNS_UART_CR_OFFSET);
+	ctrl &= ~CDNS_UART_CR_TX_DIS;
+	ctrl |= CDNS_UART_CR_TX_EN;
+	writel(ctrl, port->membase + CDNS_UART_CR_OFFSET);
 
 	uart_console_write(port, s, count, cdns_uart_console_putchar);
 	cdns_uart_console_wait_tx(port);
-- 
2.6.3.3.g9bb996a


WARNING: multiple messages have this Message-ID (diff)
From: Soren Brinkmann <soren.brinkmann@xilinx.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jslaby@suse.com>
Cc: linux-arm-kernel@lists.infradead.org,
	Soren Brinkmann <soren.brinkmann@xilinx.com>,
	Michal Simek <michal.simek@xilinx.com>,
	linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATH RESEND v2 01/10] tty: xuartps: Beautify read-modify writes
Date: Thu, 19 Nov 2015 12:02:15 -0800	[thread overview]
Message-ID: <1447963344-16266-2-git-send-email-soren.brinkmann@xilinx.com> (raw)
In-Reply-To: <1447963344-16266-1-git-send-email-soren.brinkmann@xilinx.com>

Non-functional, formatting changes to ease reading the code.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
 drivers/tty/serial/xilinx_uartps.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 009e0dbc12d2..50d4082d2354 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -515,12 +515,14 @@ static void cdns_uart_start_tx(struct uart_port *port)
 	if (uart_circ_empty(&port->state->xmit) || uart_tx_stopped(port))
 		return;
 
-	status = readl(port->membase + CDNS_UART_CR_OFFSET);
-	/* Set the TX enable bit and clear the TX disable bit to enable the
+	/*
+	 * Set the TX enable bit and clear the TX disable bit to enable the
 	 * transmitter.
 	 */
-	writel((status & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN,
-			port->membase + CDNS_UART_CR_OFFSET);
+	status = readl(port->membase + CDNS_UART_CR_OFFSET);
+	status &= ~CDNS_UART_CR_TX_DIS;
+	status |= CDNS_UART_CR_TX_EN;
+	writel(status, port->membase + CDNS_UART_CR_OFFSET);
 
 	while (numbytes-- && ((readl(port->membase + CDNS_UART_SR_OFFSET) &
 				CDNS_UART_SR_TXFULL)) != CDNS_UART_SR_TXFULL) {
@@ -1123,8 +1125,9 @@ static void cdns_uart_console_write(struct console *co, const char *s,
 	 * clear the TX disable bit to enable the transmitter.
 	 */
 	ctrl = readl(port->membase + CDNS_UART_CR_OFFSET);
-	writel((ctrl & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN,
-			port->membase + CDNS_UART_CR_OFFSET);
+	ctrl &= ~CDNS_UART_CR_TX_DIS;
+	ctrl |= CDNS_UART_CR_TX_EN;
+	writel(ctrl, port->membase + CDNS_UART_CR_OFFSET);
 
 	uart_console_write(port, s, count, cdns_uart_console_putchar);
 	cdns_uart_console_wait_tx(port);
-- 
2.6.3.3.g9bb996a

WARNING: multiple messages have this Message-ID (diff)
From: soren.brinkmann@xilinx.com (Soren Brinkmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATH RESEND v2 01/10] tty: xuartps: Beautify read-modify writes
Date: Thu, 19 Nov 2015 12:02:15 -0800	[thread overview]
Message-ID: <1447963344-16266-2-git-send-email-soren.brinkmann@xilinx.com> (raw)
In-Reply-To: <1447963344-16266-1-git-send-email-soren.brinkmann@xilinx.com>

Non-functional, formatting changes to ease reading the code.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
 drivers/tty/serial/xilinx_uartps.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 009e0dbc12d2..50d4082d2354 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -515,12 +515,14 @@ static void cdns_uart_start_tx(struct uart_port *port)
 	if (uart_circ_empty(&port->state->xmit) || uart_tx_stopped(port))
 		return;
 
-	status = readl(port->membase + CDNS_UART_CR_OFFSET);
-	/* Set the TX enable bit and clear the TX disable bit to enable the
+	/*
+	 * Set the TX enable bit and clear the TX disable bit to enable the
 	 * transmitter.
 	 */
-	writel((status & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN,
-			port->membase + CDNS_UART_CR_OFFSET);
+	status = readl(port->membase + CDNS_UART_CR_OFFSET);
+	status &= ~CDNS_UART_CR_TX_DIS;
+	status |= CDNS_UART_CR_TX_EN;
+	writel(status, port->membase + CDNS_UART_CR_OFFSET);
 
 	while (numbytes-- && ((readl(port->membase + CDNS_UART_SR_OFFSET) &
 				CDNS_UART_SR_TXFULL)) != CDNS_UART_SR_TXFULL) {
@@ -1123,8 +1125,9 @@ static void cdns_uart_console_write(struct console *co, const char *s,
 	 * clear the TX disable bit to enable the transmitter.
 	 */
 	ctrl = readl(port->membase + CDNS_UART_CR_OFFSET);
-	writel((ctrl & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN,
-			port->membase + CDNS_UART_CR_OFFSET);
+	ctrl &= ~CDNS_UART_CR_TX_DIS;
+	ctrl |= CDNS_UART_CR_TX_EN;
+	writel(ctrl, port->membase + CDNS_UART_CR_OFFSET);
 
 	uart_console_write(port, s, count, cdns_uart_console_putchar);
 	cdns_uart_console_wait_tx(port);
-- 
2.6.3.3.g9bb996a

  reply	other threads:[~2015-11-19 20:15 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-19 20:02 [PATH RESEND v2 00/10] tty: xuartps: Fix lock ups Soren Brinkmann
2015-11-19 20:02 ` Soren Brinkmann
2015-11-19 20:02 ` Soren Brinkmann
2015-11-19 20:02 ` Soren Brinkmann [this message]
2015-11-19 20:02   ` [PATH RESEND v2 01/10] tty: xuartps: Beautify read-modify writes Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 02/10] tty: xuartps: Use spinlock to serialize HW access Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 03/10] tty: xuartps: Always enable transmitter in start_tx Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 23:15   ` Peter Hurley
2015-11-20 12:13   ` Peter Hurley
2015-11-20 12:13     ` Peter Hurley
2015-11-20 15:28     ` Sören Brinkmann
2015-11-20 15:28       ` Sören Brinkmann
2015-11-20 15:28       ` Sören Brinkmann
2015-11-20 16:30       ` Peter Hurley
2015-11-20 16:30         ` Peter Hurley
2015-11-20 16:58         ` Sören Brinkmann
2015-11-20 16:58           ` Sören Brinkmann
2015-11-20 16:58           ` Sören Brinkmann
2015-11-20 17:16           ` Peter Hurley
2015-11-20 17:16             ` Peter Hurley
2015-11-20 17:29             ` Sören Brinkmann
2015-11-20 17:29               ` Sören Brinkmann
2015-11-20 17:29               ` Sören Brinkmann
2015-11-23  7:05             ` Michal Simek
2015-11-23  7:05               ` Michal Simek
2015-11-23  7:05               ` Michal Simek
2015-11-23 20:00               ` Peter Hurley
2015-11-23 20:00                 ` Peter Hurley
2015-11-24  7:26                 ` Michal Simek
2015-11-24  7:26                   ` Michal Simek
2015-11-24  7:26                   ` Michal Simek
2015-11-20 17:05     ` Sören Brinkmann
2015-11-20 17:05       ` Sören Brinkmann
2015-11-20 17:05       ` Sören Brinkmann
2015-11-20 17:12       ` Peter Hurley
2015-11-20 17:12         ` Peter Hurley
2015-11-19 20:02 ` [PATH RESEND v2 04/10] tty: xuartps: Clear interrupt status register in shutdown Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 05/10] tty: xuartps: Improve startup function Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 06/10] tty: xuartps: Keep lock for whole ISR Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 07/10] tty: xuartps: Acquire port lock for shutdown Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 08/10] tty: xuartps: Move RX path into helper function Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 09/10] tty: xuartps: Only handle RX IRQs when RX is enabled Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02 ` [PATH RESEND v2 10/10] tty: xuartps: Cleanup: Reformat if-else Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann
2015-11-19 20:02   ` Soren Brinkmann

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=1447963344-16266-2-git-send-email-soren.brinkmann@xilinx.com \
    --to=soren.brinkmann@xilinx.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=michal.simek@xilinx.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.