From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 13 Jan 2011 06:46:35 +0000 (+0900)
Subject: serial: sh-sci: build fixes.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4ae26f46c98f58ef19ad34f475617b40740d2faa;p=linux-beck.git

serial: sh-sci: build fixes.

This fixes up the port_rx_irq_mask() REIE flag definition as well as a
debug printk blowing up on the SCSCR_INIT having gone away.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 251c08c55ae0..92c91c83edde 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -794,7 +794,7 @@ static inline unsigned long port_rx_irq_mask(struct uart_port *port)
 	 * it's unset, it's logically inferred that there's no point in
 	 * testing for it.
 	 */
-	return SCSCR_RIE | (to_sci_port(port)->scscr & SCSR_REIE);
+	return SCSCR_RIE | (to_sci_port(port)->scscr & SCSCR_REIE);
 }
 
 static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
@@ -1540,7 +1540,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
 	sci_out(port, SCSMR, smr_val);
 
 	dev_dbg(port->dev, "%s: SMR %x, t %x, SCSCR %x\n", __func__, smr_val, t,
-		SCSCR_INIT(port));
+		s->scscr);
 
 	if (t > 0) {
 		if (t >= 256) {