aboutsummaryrefslogtreecommitdiffstats
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)
1619 1619
1620 port->type = s->type; 1620 port->type = s->type;
1621 1621
1622 if (port->membase)
1623 return;
1624
1625 if (port->flags & UPF_IOREMAP) { 1622 if (port->flags & UPF_IOREMAP) {
1626 port->membase = ioremap_nocache(port->mapbase, 0x40); 1623 port->membase = ioremap_nocache(port->mapbase, 0x40);
1627 1624
@@ -1727,7 +1724,6 @@ static int __devinit sci_init_single(struct platform_device *dev,
1727 init_timer(&sci_port->break_timer); 1724 init_timer(&sci_port->break_timer);
1728 1725
1729 port->mapbase = p->mapbase; 1726 port->mapbase = p->mapbase;
1730 port->membase = p->membase;
1731 1727
1732 port->irq = p->irqs[SCIx_TXI_IRQ]; 1728 port->irq = p->irqs[SCIx_TXI_IRQ];
1733 port->flags = p->flags; 1729 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;
40 * Platform device specific platform_data struct 40 * Platform device specific platform_data struct
41 */ 41 */
42struct plat_sci_port { 42struct plat_sci_port {
43 void __iomem *membase; /* io cookie */
44 unsigned long mapbase; /* resource base */ 43 unsigned long mapbase; /* resource base */
45 unsigned int irqs[SCIx_NR_IRQS]; /* ERI, RXI, TXI, BRI */ 44 unsigned int irqs[SCIx_NR_IRQS]; /* ERI, RXI, TXI, BRI */
46 unsigned int type; /* SCI / SCIF / IRDA */ 45 unsigned int type; /* SCI / SCIF / IRDA */