1 files changed, 79 insertions, 119 deletions

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index d335b250923a..55bed923fbe9 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -42,7 +42,7 @@ MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry");
 /* struct local_info::hw_priv */
 struct hostap_cs_priv {
         dev_node_t node;
-        dev_link_t *link;
+        struct pcmcia_device *link;
         int sandisk_connectplus;
 };
 
@@ -204,15 +204,13 @@ static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len)
 
 static void prism2_detach(struct pcmcia_device *p_dev);
 static void prism2_release(u_long arg);
-static int prism2_config(dev_link_t *link);
+static int prism2_config(struct pcmcia_device *link);
 
 
 static int prism2_pccard_card_present(local_info_t *local)
 {
         struct hostap_cs_priv *hw_priv = local->hw_priv;
-        if (hw_priv != NULL && hw_priv->link != NULL &&
-            ((hw_priv->link->state & (DEV_PRESENT | DEV_CONFIG)) ==
-             (DEV_PRESENT | DEV_CONFIG)))
+        if (hw_priv != NULL && hw_priv->link != NULL && pcmcia_dev_present(hw_priv->link))
                 return 1;
         return 0;
 }
@@ -237,7 +235,7 @@ static void sandisk_set_iobase(local_info_t *local)
         reg.Action = CS_WRITE;
         reg.Offset = 0x10; /* 0x3f0 IO base 1 */
         reg.Value = hw_priv->link->io.BasePort1 & 0x00ff;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 0 -"
@@ -249,7 +247,7 @@ static void sandisk_set_iobase(local_info_t *local)
         reg.Action = CS_WRITE;
         reg.Offset = 0x12; /* 0x3f2 IO base 2 */
         reg.Value = (hw_priv->link->io.BasePort1 & 0xff00) >> 8;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 1 -"
@@ -301,9 +299,9 @@ static int sandisk_enable_wireless(struct net_device *dev)
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         tuple.TupleOffset = 0;
-        if (pcmcia_get_first_tuple(hw_priv->link->handle, &tuple) ||
-            pcmcia_get_tuple_data(hw_priv->link->handle, &tuple) ||
-            pcmcia_parse_tuple(hw_priv->link->handle, &tuple, parse) ||
+        if (pcmcia_get_first_tuple(hw_priv->link, &tuple) ||
+            pcmcia_get_tuple_data(hw_priv->link, &tuple) ||
+            pcmcia_parse_tuple(hw_priv->link, &tuple, parse) ||
             parse->manfid.manf != 0xd601 || parse->manfid.card != 0x0101) {
                 /* No SanDisk manfid found */
                 ret = -ENODEV;
@@ -311,9 +309,9 @@ static int sandisk_enable_wireless(struct net_device *dev)
         }
 
         tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
-        if (pcmcia_get_first_tuple(hw_priv->link->handle, &tuple) ||
-            pcmcia_get_tuple_data(hw_priv->link->handle, &tuple) ||
-            pcmcia_parse_tuple(hw_priv->link->handle, &tuple, parse) ||
+        if (pcmcia_get_first_tuple(hw_priv->link, &tuple) ||
+            pcmcia_get_tuple_data(hw_priv->link, &tuple) ||
+            pcmcia_parse_tuple(hw_priv->link, &tuple, parse) ||
                 parse->longlink_mfc.nfn < 2) {
                 /* No multi-function links found */
                 ret = -ENODEV;
@@ -328,7 +326,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
         reg.Action = CS_WRITE;
         reg.Offset = CISREG_COR;
         reg.Value = COR_SOFT_RESET;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
@@ -345,7 +343,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
          * will be enabled during the first cor_sreset call.
          */
         reg.Value = COR_LEVEL_REQ | 0x8 | COR_ADDR_DECODE | COR_FUNC_ENA;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
@@ -380,7 +378,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
         reg.Action = CS_READ;
         reg.Offset = CISREG_COR;
         reg.Value = 0;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 1 (%d)\n",
@@ -392,7 +390,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
 
         reg.Action = CS_WRITE;
         reg.Value |= COR_SOFT_RESET;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 2 (%d)\n",
@@ -405,7 +403,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
         reg.Value &= ~COR_SOFT_RESET;
         if (hw_priv->sandisk_connectplus)
                 reg.Value |= COR_IREQ_ENA;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 3 (%d)\n",
@@ -439,7 +437,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Action = CS_READ;
         reg.Offset = CISREG_COR;
         reg.Value = 0;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 1 "
@@ -452,7 +450,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
 
         reg.Action = CS_WRITE;
         reg.Value |= COR_SOFT_RESET;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 2 "
@@ -466,7 +464,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Action = CS_WRITE;
         reg.Value = hcr;
         reg.Offset = CISREG_CCSR;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 3 "
@@ -478,7 +476,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Action = CS_WRITE;
         reg.Offset = CISREG_COR;
         reg.Value = old_cor & ~COR_SOFT_RESET;
-        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+        res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
         if (res != CS_SUCCESS) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 4 "
@@ -501,40 +499,27 @@ static struct prism2_helper_functions prism2_pccard_funcs =
 
 /* allocate local data and register with CardServices
  * initialize dev_link structure, but do not configure the card yet */
-static int prism2_attach(struct pcmcia_device *p_dev)
+static int hostap_cs_probe(struct pcmcia_device *p_dev)
 {
-        dev_link_t *link;
-
-        link = kmalloc(sizeof(dev_link_t), GFP_KERNEL);
-        if (link == NULL)
-                return -ENOMEM;
-
-        memset(link, 0, sizeof(dev_link_t));
+        int ret;
 
         PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info);
-        link->conf.Vcc = 33;
-        link->conf.IntType = INT_MEMORY_AND_IO;
-
-        link->handle = p_dev;
-        p_dev->instance = link;
+        p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
-        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-        if (prism2_config(link))
+        ret = prism2_config(p_dev);
+        if (ret) {
                 PDEBUG(DEBUG_EXTRA, "prism2_config() failed\n");
+        }
 
-        return 0;
+        return ret;
 }
 
 
-static void prism2_detach(struct pcmcia_device *p_dev)
+static void prism2_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
-
         PDEBUG(DEBUG_FLOW, "prism2_detach\n");
 
-        if (link->state & DEV_CONFIG) {
-                prism2_release((u_long)link);
-        }
+        prism2_release((u_long)link);
 
         /* release net devices */
         if (link->priv) {
@@ -547,7 +532,6 @@ static void prism2_detach(struct pcmcia_device *p_dev)
                 prism2_free_local_data(dev);
                 kfree(hw_priv);
         }
-        kfree(link);
 }
 
 
@@ -558,7 +542,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 do { int ret = (retf); \
 if (ret != 0) { \
         PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", ret); \
-        cs_error(link->handle, fn, ret); \
+        cs_error(link, fn, ret); \
         goto next_entry; \
 } \
 } while (0)
@@ -566,7 +550,7 @@ if (ret != 0) { \
 
 /* run after a CARD_INSERTION event is received to configure the PCMCIA
  * socket and make the device available to the system */
-static int prism2_config(dev_link_t *link)
+static int prism2_config(struct pcmcia_device *link)
 {
         struct net_device *dev;
         struct hostap_interface *iface;
@@ -595,27 +579,24 @@ static int prism2_config(dev_link_t *link)
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         tuple.TupleOffset = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link->handle, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link->handle, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link->handle, &tuple, parse));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, parse));
         link->conf.ConfigBase = parse->config.base;
         link->conf.Present = parse->config.rmask[0];
 
         CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link->handle, &conf));
-        PDEBUG(DEBUG_HW, "%s: %s Vcc=%d (from config)\n", dev_info,
-               ignore_cis_vcc ? "ignoring" : "setting", conf.Vcc);
-        link->conf.Vcc = conf.Vcc;
+                 pcmcia_get_configuration_info(link, &conf));
 
         /* Look for an appropriate configuration table entry in the CIS */
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link->handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         for (;;) {
                 cistpl_cftable_entry_t *cfg = &(parse->cftable_entry);
                 CFG_CHECK2(GetTupleData,
-                           pcmcia_get_tuple_data(link->handle, &tuple));
+                           pcmcia_get_tuple_data(link, &tuple));
                 CFG_CHECK2(ParseTuple,
-                           pcmcia_parse_tuple(link->handle, &tuple, parse));
+                           pcmcia_parse_tuple(link, &tuple, parse));
 
                 if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
                         dflt = *cfg;
@@ -650,10 +631,10 @@ static int prism2_config(dev_link_t *link)
                 }
 
                 if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                                 cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
                 else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp1 = link->conf.Vpp2 =
+                        link->conf.Vpp =
                                 dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
 
                 /* Do we need to allocate an interrupt? */
@@ -695,19 +676,19 @@ static int prism2_config(dev_link_t *link)
 
                 /* This reserves IO space but doesn't actually enable it */
                 CFG_CHECK2(RequestIO,
-                           pcmcia_request_io(link->handle, &link->io));
+                           pcmcia_request_io(link, &link->io));
 
                 /* This configuration table entry is OK */
                 break;
 
         next_entry:
                 CS_CHECK(GetNextTuple,
-                         pcmcia_get_next_tuple(link->handle, &tuple));
+                         pcmcia_get_next_tuple(link, &tuple));
         }
 
         /* Need to allocate net_device before requesting IRQ handler */
         dev = prism2_init_local_data(&prism2_pccard_funcs, 0,
-                                     &handle_to_dev(link->handle));
+                                     &handle_to_dev(link));
         if (dev == NULL)
                 goto failed;
         link->priv = dev;
@@ -717,7 +698,7 @@ static int prism2_config(dev_link_t *link)
         local->hw_priv = hw_priv;
         hw_priv->link = link;
         strcpy(hw_priv->node.dev_name, dev->name);
-        link->dev = &hw_priv->node;
+        link->dev_node = &hw_priv->node;
 
         /*
          * Allocate an interrupt line.  Note that this does not assign a
@@ -730,7 +711,7 @@ static int prism2_config(dev_link_t *link)
                 link->irq.Handler = prism2_interrupt;
                 link->irq.Instance = dev;
                 CS_CHECK(RequestIRQ,
-                         pcmcia_request_irq(link->handle, &link->irq));
+                         pcmcia_request_irq(link, &link->irq));
         }
 
         /*
@@ -739,18 +720,17 @@ static int prism2_config(dev_link_t *link)
          * card and host interface into "Memory and IO" mode.
          */
         CS_CHECK(RequestConfiguration,
-                 pcmcia_request_configuration(link->handle, &link->conf));
+                 pcmcia_request_configuration(link, &link->conf));
 
         dev->irq = link->irq.AssignedIRQ;
         dev->base_addr = link->io.BasePort1;
 
         /* Finally, report what we've done */
-        printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d",
-               dev_info, link->conf.ConfigIndex,
-               link->conf.Vcc / 10, link->conf.Vcc % 10);
-        if (link->conf.Vpp1)
-                printk(", Vpp %d.%d", link->conf.Vpp1 / 10,
-                       link->conf.Vpp1 % 10);
+        printk(KERN_INFO "%s: index 0x%02x: ",
+               dev_info, link->conf.ConfigIndex);
+        if (link->conf.Vpp)
+                printk(", Vpp %d.%d", link->conf.Vpp / 10,
+                       link->conf.Vpp % 10);
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 printk(", irq %d", link->irq.AssignedIRQ);
         if (link->io.NumPorts1)
@@ -761,9 +741,6 @@ static int prism2_config(dev_link_t *link)
                        link->io.BasePort2+link->io.NumPorts2-1);
         printk("\n");
 
-        link->state |= DEV_CONFIG;
-        link->state &= ~DEV_CONFIG_PENDING;
-
         local->shutdown = 0;
 
         sandisk_enable_wireless(dev);
@@ -778,7 +755,7 @@ static int prism2_config(dev_link_t *link)
         return ret;
 
  cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
 
  failed:
         kfree(parse);
@@ -790,7 +767,7 @@ static int prism2_config(dev_link_t *link)
 
 static void prism2_release(u_long arg)
 {
-        dev_link_t *link = (dev_link_t *)arg;
+        struct pcmcia_device *link = (struct pcmcia_device *)arg;
 
         PDEBUG(DEBUG_FLOW, "prism2_release\n");
 
@@ -799,71 +776,54 @@ static void prism2_release(u_long arg)
                 struct hostap_interface *iface;
 
                 iface = netdev_priv(dev);
-                if (link->state & DEV_CONFIG)
-                        prism2_hw_shutdown(dev, 0);
+                prism2_hw_shutdown(dev, 0);
                 iface->local->shutdown = 1;
         }
 
-        if (link->win)
-                pcmcia_release_window(link->win);
-        pcmcia_release_configuration(link->handle);
-        if (link->io.NumPorts1)
-                pcmcia_release_io(link->handle, &link->io);
-        if (link->irq.AssignedIRQ)
-                pcmcia_release_irq(link->handle, &link->irq);
-
-        link->state &= ~DEV_CONFIG;
-
+        pcmcia_disable_device(link);
         PDEBUG(DEBUG_FLOW, "release - done\n");
 }
 
-static int hostap_cs_suspend(struct pcmcia_device *p_dev)
+static int hostap_cs_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = (struct net_device *) link->priv;
         int dev_open = 0;
+        struct hostap_interface *iface = NULL;
 
-        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
-
-        link->state |= DEV_SUSPEND;
+        if (dev)
+                iface = netdev_priv(dev);
 
-        if (link->state & DEV_CONFIG) {
-                struct hostap_interface *iface = netdev_priv(dev);
-                if (iface && iface->local)
-                        dev_open = iface->local->num_dev_open > 0;
-                if (dev_open) {
-                        netif_stop_queue(dev);
-                        netif_device_detach(dev);
-                }
-                prism2_suspend(dev);
-                pcmcia_release_configuration(link->handle);
+        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
+        if (iface && iface->local)
+                dev_open = iface->local->num_dev_open > 0;
+        if (dev_open) {
+                netif_stop_queue(dev);
+                netif_device_detach(dev);
         }
+        prism2_suspend(dev);
 
         return 0;
 }
 
-static int hostap_cs_resume(struct pcmcia_device *p_dev)
+static int hostap_cs_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = (struct net_device *) link->priv;
         int dev_open = 0;
+        struct hostap_interface *iface = NULL;
 
-        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);
+        if (dev)
+                iface = netdev_priv(dev);
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                struct hostap_interface *iface = netdev_priv(dev);
-                if (iface && iface->local)
-                        dev_open = iface->local->num_dev_open > 0;
+        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);
 
-                pcmcia_request_configuration(link->handle, &link->conf);
+        if (iface && iface->local)
+                dev_open = iface->local->num_dev_open > 0;
 
-                prism2_hw_shutdown(dev, 1);
-                prism2_hw_config(dev, dev_open ? 0 : 1);
-                if (dev_open) {
-                        netif_device_attach(dev);
-                        netif_start_queue(dev);
-                }
+        prism2_hw_shutdown(dev, 1);
+        prism2_hw_config(dev, dev_open ? 0 : 1);
+        if (dev_open) {
+                netif_device_attach(dev);
+                netif_start_queue(dev);
         }
 
         return 0;
@@ -930,7 +890,7 @@ static struct pcmcia_driver hostap_driver = {
         .drv            = {
                 .name   = "hostap_cs",
         },
-        .probe          = prism2_attach,
+        .probe          = hostap_cs_probe,
         .remove         = prism2_detach,
         .owner          = THIS_MODULE,
         .id_table       = hostap_cs_ids,