aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-01-21 15:14:22 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-05-08 23:16:07 +0900
commit08f8cb315fdf9195b472aeb440ae65b189b151da (patch)
treef0bab5565847b51008dc2845abf532b5e752a716 /drivers
parent7ed7e0711b3ff85b3e15591081b42f2af96d584b (diff)
sh-sci: ioremap() in a single place
Handle ioremap() in sci_config_port only. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/sh-sci.c54
1 files changed, 20 insertions, 34 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 039c700ce1e..408624ae7fe 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -994,9 +994,21 @@ static void sci_config_port(struct uart_port *port, int flags)
port->type = s->type;
- if (port->flags & UPF_IOREMAP && !port->membase) {
+ if (port->membase)
+ return;
+
+ if (port->flags & UPF_IOREMAP) {
port->membase = ioremap_nocache(port->mapbase, 0x40);
- dev_err(port->dev, "can't remap port#%d\n", port->line);
+
+ if (IS_ERR(port->membase))
+ dev_err(port->dev, "can't remap port#%d\n", port->line);
+ } else {
+ /*
+ * For the simple (and majority of) cases where we don't
+ * need to do any remapping, just cast the cookie
+ * directly.
+ */
+ port->membase = (void __iomem *)port->mapbase;
}
}
@@ -1036,9 +1048,9 @@ static struct uart_ops sci_uart_ops = {
#endif
};
-static int __devinit sci_init_single(struct sci_port *sci_port,
- unsigned int index,
- struct plat_sci_port *p)
+static void __devinit sci_init_single(struct sci_port *sci_port,
+ unsigned int index,
+ struct plat_sci_port *p)
{
sci_port->port.ops = &sci_uart_ops;
sci_port->port.iotype = UPIO_MEM;
@@ -1069,22 +1081,6 @@ static int __devinit sci_init_single(struct sci_port *sci_port,
init_timer(&sci_port->break_timer);
sci_port->port.mapbase = p->mapbase;
-
- if (p->mapbase && !p->membase) {
- if (p->flags & UPF_IOREMAP) {
- p->membase = ioremap_nocache(p->mapbase, 0x40);
- if (IS_ERR(p->membase))
- return PTR_ERR(p->membase);
- } else {
- /*
- * For the simple (and majority of) cases
- * where we don't need to do any remapping,
- * just cast the cookie directly.
- */
- p->membase = (void __iomem *)p->mapbase;
- }
- }
-
sci_port->port.membase = p->membase;
sci_port->port.irq = p->irqs[SCIx_TXI_IRQ];
@@ -1092,8 +1088,6 @@ static int __devinit sci_init_single(struct sci_port *sci_port,
sci_port->type = sci_port->port.type = p->type;
memcpy(&sci_port->irqs, &p->irqs, sizeof(p->irqs));
-
- return 0;
}
#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
@@ -1163,8 +1157,7 @@ static int __init serial_console_setup(struct console *co, char *options)
sci_port->clk = clk_get(NULL, "module_clk");
#endif
- if (port->flags & UPF_IOREMAP)
- sci_config_port(port, 0);
+ sci_config_port(port, 0);
if (sci_port->enable)
sci_port->enable(port);
@@ -1258,18 +1251,11 @@ static int __devinit sci_probe_single(struct platform_device *dev,
}
sciport->port.dev = &dev->dev;
- ret = sci_init_single(sciport, index, p);
- if (ret)
- return ret;
+ sci_init_single(sciport, index, p);
ret = uart_add_one_port(&sci_uart_driver, &sciport->port);
-
- if (ret) {
- if (p->flags & UPF_IOREMAP)
- iounmap(p->membase);
-
+ if (ret)
return ret;
- }
INIT_LIST_HEAD(&sciport->node);