serial: sh-sci: Fix up ioremap handling.

We were using an IS_ERR() check for the ioremap case, presumably because
this matched the old custom ioremap call that sh64 was providing. Now
that all ioremap() implementations trap the IS_ERR case and hand back a
NULL, check for that instead.

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

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 31ac092b16d84837ce8c23abeb6f90456265136a..44d5bd10702b822a2d1607e58245a6e6bb498ab6 100644 (file)
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1482,6 +1482,7 @@ static unsigned int sci_scbrr_calc(unsigned int algo_id, unsigned int bps,
 
        /* Warn, but use a safe default */
        WARN_ON(1);
+
        return ((freq + 16 * bps) / (32 * bps) - 1);
 }
 
@@ -1517,6 +1518,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
                sci_out(port, SCFCR, scfcr | SCFCR_RFRST | SCFCR_TFRST);
 
        smr_val = sci_in(port, SCSMR) & 3;
+
        if ((termios->c_cflag & CSIZE) == CS7)
                smr_val |= 0x40;
        if (termios->c_cflag & PARENB)
@@ -1612,8 +1614,7 @@ static void sci_config_port(struct uart_port *port, int flags)
 
        if (port->flags & UPF_IOREMAP) {
                port->membase = ioremap_nocache(port->mapbase, 0x40);
-
-               if (IS_ERR(port->membase))
+               if (unlikely(!port->membase))
                        dev_err(port->dev, "can't remap port#%d\n", port->line);
        } else {
                /*