diff mbox

[4/8] serial: sh-sci: Use SCIF_DR instead of hardcoded 1

Message ID 1432145174-11534-5-git-send-email-geert+renesas@glider.be (mailing list archive)
State Superseded
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Geert Uytterhoeven May 20, 2015, 6:06 p.m. UTC
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/tty/serial/sh-sci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Laurent Pinchart May 23, 2015, 7:09 p.m. UTC | #1
Hi Geert,

Thank you for the patch.

On Wednesday 20 May 2015 20:06:10 Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/tty/serial/sh-sci.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index 21c07c6cb0cd2220..73f4115159a7fbbc 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -960,7 +960,8 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
>  		}
>  		serial_port_out(port, SCSCR, scr);
>  		/* Clear current interrupt */
> -		serial_port_out(port, SCxSR, ssr & ~(1 | SCxSR_RDxF(port)));
> +		serial_port_out(port, SCxSR,
> +				ssr & ~(SCIF_DR | SCxSR_RDxF(port)));
>  		dev_dbg(port->dev, "Rx IRQ %lu: setup t-out in %u jiffies\n",
>  			jiffies, s->rx_timeout);
>  		mod_timer(&s->rx_timer, jiffies + s->rx_timeout);
diff mbox

Patch

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 21c07c6cb0cd2220..73f4115159a7fbbc 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -960,7 +960,8 @@  static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
 		}
 		serial_port_out(port, SCSCR, scr);
 		/* Clear current interrupt */
-		serial_port_out(port, SCxSR, ssr & ~(1 | SCxSR_RDxF(port)));
+		serial_port_out(port, SCxSR,
+				ssr & ~(SCIF_DR | SCxSR_RDxF(port)));
 		dev_dbg(port->dev, "Rx IRQ %lu: setup t-out in %u jiffies\n",
 			jiffies, s->rx_timeout);
 		mod_timer(&s->rx_timer, jiffies + s->rx_timeout);