1 files changed, 45 insertions, 13 deletions

diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index a6793e30cf7..98c791537ca 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -30,9 +30,6 @@ static struct pcmcia_irqs irqs[] = {
 
 int sa1111_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-        if (skt->irq == NO_IRQ)
-                skt->irq = skt->nr ? IRQ_S1_READY_NINT : IRQ_S0_READY_NINT;
-
         return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
 }
 
@@ -43,8 +40,8 @@ void sa1111_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
 
 void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
 {
-        struct sa1111_dev *sadev = SA1111_DEV(skt->dev);
-        unsigned long status = sa1111_readl(sadev->mapbase + SA1111_PCSR);
+        struct sa1111_pcmcia_socket *s = to_skt(skt);
+        unsigned long status = sa1111_readl(s->dev->mapbase + SA1111_PCSR);
 
         switch (skt->nr) {
         case 0:
@@ -71,7 +68,7 @@ void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_sta
 
 int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
 {
-        struct sa1111_dev *sadev = SA1111_DEV(skt->dev);
+        struct sa1111_pcmcia_socket *s = to_skt(skt);
         unsigned int pccr_skt_mask, pccr_set_mask, val;
         unsigned long flags;
 
@@ -100,10 +97,10 @@ int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s
                 pccr_set_mask |= PCCR_S0_FLT|PCCR_S1_FLT;
 
         local_irq_save(flags);
-        val = sa1111_readl(sadev->mapbase + SA1111_PCCR);
+        val = sa1111_readl(s->dev->mapbase + SA1111_PCCR);
         val &= ~pccr_skt_mask;
         val |= pccr_set_mask & pccr_skt_mask;
-        sa1111_writel(val, sadev->mapbase + SA1111_PCCR);
+        sa1111_writel(val, s->dev->mapbase + SA1111_PCCR);
         local_irq_restore(flags);
 
         return 0;
@@ -119,10 +116,45 @@ void sa1111_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
         soc_pcmcia_disable_irqs(skt, irqs, ARRAY_SIZE(irqs));
 }
 
+int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops,
+        int (*add)(struct soc_pcmcia_socket *))
+{
+        struct sa1111_pcmcia_socket *s;
+        int i, ret = 0;
+
+        s = kzalloc(sizeof(*s) * ops->nr, GFP_KERNEL);
+        if (!s)
+                return -ENODEV;
+
+        for (i = 0; i < ops->nr; i++) {
+                s = kzalloc(sizeof(*s), GFP_KERNEL);
+                if (!s)
+                        return -ENOMEM;
+
+                s->soc.nr = ops->first + i;
+                s->soc.irq = s->soc.nr ? IRQ_S1_READY_NINT : IRQ_S0_READY_NINT;
+                s->soc.ops = ops;
+                s->soc.socket.owner = ops->owner;
+                s->soc.socket.dev.parent = &dev->dev;
+                s->dev = dev;
+
+                ret = add(&s->soc);
+                if (ret == 0) {
+                        s->next = dev_get_drvdata(&dev->dev);
+                        dev_set_drvdata(&dev->dev, s);
+                } else
+                        kfree(s);
+        }
+
+        return ret;
+}
+
 static int pcmcia_probe(struct sa1111_dev *dev)
 {
         void __iomem *base;
 
+        dev_set_drvdata(&dev->dev, NULL);
+
         if (!request_mem_region(dev->res.start, 512,
                                 SA1111_DRIVER_NAME(dev)))
                 return -EBUSY;
@@ -152,15 +184,15 @@ static int pcmcia_probe(struct sa1111_dev *dev)
 
 static int __devexit pcmcia_remove(struct sa1111_dev *dev)
 {
-        struct skt_dev_info *sinfo = dev_get_drvdata(&dev->dev);
-        int i;
+        struct sa1111_pcmcia_socket *next, *s = dev_get_drvdata(&dev->dev);
 
         dev_set_drvdata(&dev->dev, NULL);
 
-        for (i = 0; i < sinfo->nskt; i++)
-                soc_pcmcia_remove_one(&sinfo->skt[i]);
+        for (; next = s->next, s; s = next) {
+                soc_pcmcia_remove_one(&s->soc);
+                kfree(s);
+        }
 
-        kfree(sinfo);
         release_mem_region(dev->res.start, 512);
         return 0;
 }