include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / pcmcia / sa1111_generic.c

diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index de6bc333d29907187137203392d659096c312b8b..59866905ea37e5f2150221506cf9bac73b2eaa6d 100644 (file)
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -12,6 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 
 #include <pcmcia/ss.h>
 
@@ -21,11 +22,18 @@
 
 #include "sa1111_generic.h"
 
+#define IDX_IRQ_S0_READY_NINT  (0)
+#define IDX_IRQ_S0_CD_VALID    (1)
+#define IDX_IRQ_S0_BVD1_STSCHG (2)
+#define IDX_IRQ_S1_READY_NINT  (3)
+#define IDX_IRQ_S1_CD_VALID    (4)
+#define IDX_IRQ_S1_BVD1_STSCHG (5)
+
 static struct pcmcia_irqs irqs[] = {
-       { 0, IRQ_S0_CD_VALID,    "SA1111 PCMCIA card detect" },
-       { 0, IRQ_S0_BVD1_STSCHG, "SA1111 PCMCIA BVD1"        },
-       { 1, IRQ_S1_CD_VALID,    "SA1111 CF card detect"     },
-       { 1, IRQ_S1_BVD1_STSCHG, "SA1111 CF BVD1"            },
+       { 0, NO_IRQ, "SA1111 PCMCIA card detect" },
+       { 0, NO_IRQ, "SA1111 PCMCIA BVD1"        },
+       { 1, NO_IRQ, "SA1111 CF card detect"     },
+       { 1, NO_IRQ, "SA1111 CF BVD1"            },
 };
 
 static int sa1111_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
@@ -136,7 +144,9 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops,
                s->soc.ops = ops;
                s->soc.socket.owner = ops->owner;
                s->soc.socket.dev.parent = &dev->dev;
-               s->soc.socket.pci_irq = s->soc.nr ? IRQ_S1_READY_NINT : IRQ_S0_READY_NINT;
+               s->soc.socket.pci_irq = s->soc.nr ?
+                               dev->irq[IDX_IRQ_S0_READY_NINT] :
+                               dev->irq[IDX_IRQ_S1_READY_NINT];
                s->dev = dev;
 
                ret = add(&s->soc);
@@ -162,6 +172,12 @@ static int pcmcia_probe(struct sa1111_dev *dev)
 
        base = dev->mapbase;
 
+       /* Initialize PCMCIA IRQs */
+       irqs[0].irq = dev->irq[IDX_IRQ_S0_CD_VALID];
+       irqs[1].irq = dev->irq[IDX_IRQ_S0_BVD1_STSCHG];
+       irqs[2].irq = dev->irq[IDX_IRQ_S1_CD_VALID];
+       irqs[3].irq = dev->irq[IDX_IRQ_S1_BVD1_STSCHG];
+
        /*
         * Initialise the suspend state.
         */
@@ -198,16 +214,6 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev)
        return 0;
 }
 
-static int pcmcia_suspend(struct sa1111_dev *dev, pm_message_t state)
-{
-       return pcmcia_socket_dev_suspend(&dev->dev);
-}
-
-static int pcmcia_resume(struct sa1111_dev *dev)
-{
-       return pcmcia_socket_dev_resume(&dev->dev);
-}
-
 static struct sa1111_driver pcmcia_driver = {
        .drv = {
                .name   = "sa1111-pcmcia",
@@ -215,8 +221,6 @@ static struct sa1111_driver pcmcia_driver = {
        .devid          = SA1111_DEVID_PCMCIA,
        .probe          = pcmcia_probe,
        .remove         = __devexit_p(pcmcia_remove),
-       .suspend        = pcmcia_suspend,
-       .resume         = pcmcia_resume,
 };
 
 static int __init sa1111_drv_pcmcia_init(void)