summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/serial/sh-sci.c4
-rw-r--r--include/linux/serial_sci.h1
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 92c91c83edde..1d1e700c7a43 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1619,9 +1619,6 @@ static void sci_config_port(struct uart_port *port, int flags)
port->type = s->type;
- if (port->membase)
- return;
-
if (port->flags & UPF_IOREMAP) {
port->membase = ioremap_nocache(port->mapbase, 0x40);
@@ -1727,7 +1724,6 @@ static int __devinit sci_init_single(struct platform_device *dev,
init_timer(&sci_port->break_timer);
port->mapbase = p->mapbase;
- port->membase = p->membase;
port->irq = p->irqs[SCIx_TXI_IRQ];
port->flags = p->flags;
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index f538132f9622..789acf5b31d3 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -40,7 +40,6 @@ struct device;
* Platform device specific platform_data struct
*/
struct plat_sci_port {
- void __iomem *membase; /* io cookie */
unsigned long mapbase; /* resource base */
unsigned int irqs[SCIx_NR_IRQS]; /* ERI, RXI, TXI, BRI */
unsigned int type; /* SCI / SCIF / IRDA */
OpenPOWER on IntegriCloud