2 files changed, 34 insertions, 52 deletions

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 96d26d7f8031..c4111162ec5e 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -58,6 +58,23 @@
 
 #include "sh-sci.h"
 
+/* Offsets into the sci_port->irqs array */
+enum {
+        SCIx_ERI_IRQ,
+        SCIx_RXI_IRQ,
+        SCIx_TXI_IRQ,
+        SCIx_BRI_IRQ,
+        SCIx_NR_IRQS,
+
+        SCIx_MUX_IRQ = SCIx_NR_IRQS,    /* special case */
+};
+
+#define SCIx_IRQ_IS_MUXED(port)                 \
+        ((port)->irqs[SCIx_ERI_IRQ] ==  \
+         (port)->irqs[SCIx_RXI_IRQ]) || \
+        ((port)->irqs[SCIx_ERI_IRQ] &&  \
+         ((port)->irqs[SCIx_RXI_IRQ] < 0))
+
 struct sci_port {
         struct uart_port        port;
 
@@ -2094,36 +2111,27 @@ static int sci_init_single(struct platform_device *dev,
         port->iotype    = UPIO_MEM;
         port->line      = index;
 
-        if (dev->num_resources) {
-                /* Device has resources, use them. */
-                res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-                if (res == NULL)
-                        return -ENOMEM;
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        if (res == NULL)
+                return -ENOMEM;
 
-                port->mapbase = res->start;
+        port->mapbase = res->start;
 
-                for (i = 0; i < ARRAY_SIZE(sci_port->irqs); ++i)
-                        sci_port->irqs[i] = platform_get_irq(dev, i);
+        for (i = 0; i < ARRAY_SIZE(sci_port->irqs); ++i)
+                sci_port->irqs[i] = platform_get_irq(dev, i);
 
-                /* The SCI generates several interrupts. They can be muxed
-                 * together or connected to different interrupt lines. In the
-                 * muxed case only one interrupt resource is specified. In the
-                 * non-muxed case three or four interrupt resources are
-                 * specified, as the BRI interrupt is optional.
-                 */
-                if (sci_port->irqs[0] < 0)
-                        return -ENXIO;
+        /* The SCI generates several interrupts. They can be muxed together or
+         * connected to different interrupt lines. In the muxed case only one
+         * interrupt resource is specified. In the non-muxed case three or four
+         * interrupt resources are specified, as the BRI interrupt is optional.
+         */
+        if (sci_port->irqs[0] < 0)
+                return -ENXIO;
 
-                if (sci_port->irqs[1] < 0) {
-                        sci_port->irqs[1] = sci_port->irqs[0];
-                        sci_port->irqs[2] = sci_port->irqs[0];
-                        sci_port->irqs[3] = sci_port->irqs[0];
-                }
-        } else {
-                /* No resources, use old-style platform data. */
-                port->mapbase = p->mapbase;
-                for (i = 0; i < ARRAY_SIZE(sci_port->irqs); ++i)
-                        sci_port->irqs[i] = p->irqs[i] ? p->irqs[i] : -ENXIO;
+        if (sci_port->irqs[1] < 0) {
+                sci_port->irqs[1] = sci_port->irqs[0];
+                sci_port->irqs[2] = sci_port->irqs[0];
+                sci_port->irqs[3] = sci_port->irqs[0];
         }
 
         if (p->regtype == SCIx_PROBE_REGTYPE) {
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index fd7f9daa92cc..22b3640c9424 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -50,17 +50,6 @@
 /* HSSRR HSCIF */
 #define HSCIF_SRE       0x8000
 
-/* Offsets into the sci_port->irqs array */
-enum {
-        SCIx_ERI_IRQ,
-        SCIx_RXI_IRQ,
-        SCIx_TXI_IRQ,
-        SCIx_BRI_IRQ,
-        SCIx_NR_IRQS,
-
-        SCIx_MUX_IRQ = SCIx_NR_IRQS,    /* special case */
-};
-
 enum {
         SCIx_PROBE_REGTYPE,
 
@@ -79,19 +68,6 @@ enum {
         SCIx_NR_REGTYPES,
 };
 
-#define SCIx_IRQ_MUXED(irq)             \
-{                                       \
-        [SCIx_ERI_IRQ]  = (irq),        \
-        [SCIx_RXI_IRQ]  = (irq),        \
-        [SCIx_TXI_IRQ]  = (irq),        \
-        [SCIx_BRI_IRQ]  = (irq),        \
-}
-
-#define SCIx_IRQ_IS_MUXED(port)                 \
-        ((port)->irqs[SCIx_ERI_IRQ] ==  \
-         (port)->irqs[SCIx_RXI_IRQ]) || \
-        ((port)->irqs[SCIx_ERI_IRQ] &&  \
-         ((port)->irqs[SCIx_RXI_IRQ] < 0))
 /*
  * SCI register subset common for all port types.
  * Not all registers will exist on all parts.
@@ -120,8 +96,6 @@ struct plat_sci_port_ops {
  * Platform device specific platform_data struct
  */
 struct plat_sci_port {
-        unsigned long   mapbase;                /* resource base */
-        unsigned int    irqs[SCIx_NR_IRQS];     /* ERI, RXI, TXI, BRI */
         unsigned int    type;                   /* SCI / SCIF / IRDA / HSCIF */
         upf_t           flags;                  /* UPF_* flags */
         unsigned long   capabilities;           /* Port features/capabilities */