Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: ioctl-internal definitions
  pcmcia: cistpl header cleanup
  pcmcia: remove unused argument to pcmcia_parse_tuple()
  pcmcia: card services header cleanup
  pcmcia: device_id header cleanup
  pcmcia: encapsulate ioaddr_t
  pcmcia: cleanup device driver header file
  pcmcia: cleanup socket services header file
  pcmcia: merge ds_internal.h into cs_internal.h
  pcmcia: cleanup cs_internal.h
  pcmcia: cs_internal.h is internal
  pcmcia: use dev_printk for cs_error()
  pcmcia: remove CS_ error codes alltogether
  pcmcia: deprecate CS_BAD_TUPLE
  pcmcia: deprecate CS_BAD_ARGS
  pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
  pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
  pcmcia: deprecate CS_NO_MORE_ITEMS
  pcmcia: deprecate CS_IN_USE
  pcmcia: deprecate CS_CONFIGURATION_LOCKED
  ...

Fix trivial conflict in drivers/pcmcia/ds.c manually

11 files changed, 429 insertions, 523 deletions

diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index fd72e427cb28..27696c20f4c2 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -206,126 +206,123 @@ static void airo_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
+static int airo_cs_config_check(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cfg,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
+{
+        win_req_t *req = priv_data;
+
+        if (cfg->index == 0)
+                return -ENODEV;
+
+        /* Does this card need audio output? */
+        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
+        }
+
+        /* Use power settings for Vcc and Vpp if present */
+        /*  Note that the CIS values need to be rescaled */
+        if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
+        else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
+
+        /* Do we need to allocate an interrupt? */
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+        }
+
+        /* This reserves IO space but doesn't actually enable it */
+        if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                return -ENODEV;
+
+        /*
+          Now set up a common memory window, if needed.  There is room
+          in the struct pcmcia_device structure for one memory window handle,
+          but if the base addresses need to be saved, or if multiple
+          windows are needed, the info should go in the private data
+          structure for this device.
+
+          Note that the memory window base is a physical address, and
+          needs to be mapped to virtual space with ioremap() before it
+          is used.
+        */
+        if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
+                cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
+                memreq_t map;
+                req->Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
+                req->Base = mem->win[0].host_addr;
+                req->Size = mem->win[0].len;
+                req->AccessSpeed = 0;
+                if (pcmcia_request_window(&p_dev, req, &p_dev->win) != 0)
+                        return -ENODEV;
+                map.Page = 0;
+                map.CardOffset = mem->win[0].card_addr;
+                if (pcmcia_map_mem_page(p_dev->win, &map) != 0)
+                        return -ENODEV;
+        }
+        /* If we got this far, we're cool! */
+        return 0;
+}
+
+
 static int airo_config(struct pcmcia_device *link)
 {
-        tuple_t tuple;
-        cisparse_t parse;
         local_info_t *dev;
+        win_req_t *req;
         int last_fn, last_ret;
-        u_char buf[64];
-        win_req_t req;
-        memreq_t map;
 
         dev = link->priv;
 
         DEBUG(0, "airo_config(0x%p)\n", link);
 
+        req = kzalloc(sizeof(win_req_t), GFP_KERNEL);
+        if (!req)
+                return -ENOMEM;
+
+        /*
+         * In this loop, we scan the CIS for configuration table
+         * entries, each of which describes a valid card
+         * configuration, including voltage, IO window, memory window,
+         * and interrupt settings.
+         *
+         * We make no assumptions about the card to be configured: we
+         * use just the information available in the CIS.  In an ideal
+         * world, this would work for any PCMCIA card, but it requires
+         * a complete and accurate CIS.  In practice, a driver usually
+         * "knows" most of these things without consulting the CIS,
+         * and most client drivers will only use the CIS to fill in
+         * implementation-defined details.
+         */
+        last_ret = pcmcia_loop_config(link, airo_cs_config_check, req);
+        if (last_ret)
+                goto failed;
+
         /*
-          In this loop, we scan the CIS for configuration table entries,
-          each of which describes a valid card configuration, including
-          voltage, IO window, memory window, and interrupt settings.
-          
-          We make no assumptions about the card to be configured: we use
-          just the information available in the CIS.  In an ideal world,
-          this would work for any PCMCIA card, but it requires a complete
-          and accurate CIS.  In practice, a driver usually "knows" most of
-          these things without consulting the CIS, and most client drivers
-          will only use the CIS to fill in implementation-defined details.
+          Allocate an interrupt line.  Note that this does not assign a
+          handler to the interrupt, unless the 'Handler' member of the
+          irq structure is initialized.
         */
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t dflt = { 0 };
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
-                
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
-                if (cfg->index == 0) goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-                
-                /* Does this card need audio output? */
-                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                        link->conf.Attributes |= CONF_ENABLE_SPKR;
-                        link->conf.Status = CCSR_AUDIO_ENA;
-                }
-                
-                /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
-                if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
-                else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
-                
-                /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-                
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 = link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                }
-                
-                /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(link, &link->io) != 0)
-                        goto next_entry;
-                
-                /*
-                  Now set up a common memory window, if needed.  There is room
-                  in the struct pcmcia_device structure for one memory window handle,
-                  but if the base addresses need to be saved, or if multiple
-                  windows are needed, the info should go in the private data
-                  structure for this device.
-                  
-                  Note that the memory window base is a physical address, and
-                  needs to be mapped to virtual space with ioremap() before it
-                  is used.
-                */
-                if ((cfg->mem.nwin > 0) || (dflt.mem.nwin > 0)) {
-                        cistpl_mem_t *mem =
-                                (cfg->mem.nwin) ? &cfg->mem : &dflt.mem;
-                        req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
-                        req.Base = mem->win[0].host_addr;
-                        req.Size = mem->win[0].len;
-                        req.AccessSpeed = 0;
-                        if (pcmcia_request_window(&link, &req, &link->win) != 0)
-                                goto next_entry;
-                        map.Page = 0; map.CardOffset = mem->win[0].card_addr;
-                        if (pcmcia_map_mem_page(link->win, &map) != 0)
-                                goto next_entry;
-                }
-                /* If we got this far, we're cool! */
-                break;
-                
-        next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
-        }
-        
-    /*
-      Allocate an interrupt line.  Note that this does not assign a
-      handler to the interrupt, unless the 'Handler' member of the
-      irq structure is initialized.
-    */
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
                 CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
         
@@ -362,14 +359,17 @@ static int airo_config(struct pcmcia_device *link)
                 printk(" & 0x%04x-0x%04x", link->io.BasePort2,
                        link->io.BasePort2+link->io.NumPorts2-1);
         if (link->win)
-                printk(", mem 0x%06lx-0x%06lx", req.Base,
-                       req.Base+req.Size-1);
+                printk(", mem 0x%06lx-0x%06lx", req->Base,
+                       req->Base+req->Size-1);
         printk("\n");
+        kfree(req);
         return 0;
 
  cs_failed:
         cs_error(link, last_fn, last_ret);
+ failed:
         airo_release(link);
+        kfree(req);
         return -ENODEV;
 } /* airo_config */
 
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index d2388e8d179a..77406245dc7b 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -224,13 +224,58 @@ static int card_present(void *arg)
         return 0;
 }
 
+static int atmel_config_check(struct pcmcia_device *p_dev,
+                              cistpl_cftable_entry_t *cfg,
+                              cistpl_cftable_entry_t *dflt,
+                              unsigned int vcc,
+                              void *priv_data)
+{
+        if (cfg->index == 0)
+                return -ENODEV;
+
+        /* Does this card need audio output? */
+        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
+        }
+
+        /* Use power settings for Vcc and Vpp if present */
+        /*  Note that the CIS values need to be rescaled */
+        if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
+        else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
+
+        /* Do we need to allocate an interrupt? */
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+        }
+
+        /* This reserves IO space but doesn't actually enable it */
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
+
 static int atmel_config(struct pcmcia_device *link)
 {
-        tuple_t tuple;
-        cisparse_t parse;
         local_info_t *dev;
         int last_fn, last_ret;
-        u_char buf[64];
         struct pcmcia_device_id *did;
 
         dev = link->priv;
@@ -238,11 +283,6 @@ static int atmel_config(struct pcmcia_device *link)
 
         DEBUG(0, "atmel_config(0x%p)\n", link);
 
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-
         /*
           In this loop, we scan the CIS for configuration table entries,
           each of which describes a valid card configuration, including
@@ -255,66 +295,8 @@ static int atmel_config(struct pcmcia_device *link)
           these things without consulting the CIS, and most client drivers
           will only use the CIS to fill in implementation-defined details.
         */
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t dflt = { 0 };
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
-
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
-                if (cfg->index == 0) goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-
-                /* Does this card need audio output? */
-                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                        link->conf.Attributes |= CONF_ENABLE_SPKR;
-                        link->conf.Status = CCSR_AUDIO_ENA;
-                }
-
-                /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
-                if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
-                else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
-
-                /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 = link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                }
-
-                /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(link, &link->io) != 0)
-                        goto next_entry;
-
-                /* If we got this far, we're cool! */
-                break;
-
-        next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
-        }
+        if (pcmcia_loop_config(link, atmel_config_check, NULL))
+                goto failed;
 
         /*
           Allocate an interrupt line.  Note that this does not assign a
@@ -360,6 +342,7 @@ static int atmel_config(struct pcmcia_device *link)
 
  cs_failed:
         cs_error(link, last_fn, last_ret);
+ failed:
         atmel_release(link);
         return -ENODEV;
 }
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index b8aa16307f79..3cfc30307a27 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -82,13 +82,13 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
         tuple.TupleOffset = 0;
 
         res = pcmcia_get_first_tuple(dev, &tuple);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_kfree_ssb;
         res = pcmcia_get_tuple_data(dev, &tuple);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_kfree_ssb;
-        res = pcmcia_parse_tuple(dev, &tuple, &parse);
-        if (res != CS_SUCCESS)
+        res = pcmcia_parse_tuple(&tuple, &parse);
+        if (res != 0)
                 goto err_kfree_ssb;
 
         dev->conf.ConfigBase = parse.config.base;
@@ -107,13 +107,13 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
         win.Size = SSB_CORE_SIZE;
         win.AccessSpeed = 250;
         res = pcmcia_request_window(&dev, &win, &dev->win);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_kfree_ssb;
 
         mem.CardOffset = 0;
         mem.Page = 0;
         res = pcmcia_map_mem_page(dev->win, &mem);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_disable;
 
         dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
@@ -121,11 +121,11 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
         dev->irq.Handler = NULL; /* The handler is registered later. */
         dev->irq.Instance = NULL;
         res = pcmcia_request_irq(dev, &dev->irq);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_disable;
 
         res = pcmcia_request_configuration(dev, &dev->conf);
-        if (res != CS_SUCCESS)
+        if (res != 0)
                 goto err_disable;
 
         err = ssb_bus_pcmciabus_register(ssb, dev, win.Base);
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 3b4e55cf33cd..633740277352 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -234,7 +234,7 @@ static void sandisk_set_iobase(local_info_t *local)
         reg.Value = hw_priv->link->io.BasePort1 & 0x00ff;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 0 -"
                        " res=%d\n", res);
         }
@@ -246,7 +246,7 @@ static void sandisk_set_iobase(local_info_t *local)
         reg.Value = (hw_priv->link->io.BasePort1 & 0xff00) >> 8;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 1 -"
                        " res=%d\n", res);
         }
@@ -305,7 +305,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
         tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
         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) ||
+            pcmcia_parse_tuple(&tuple, parse) ||
                 parse->longlink_mfc.nfn < 2) {
                 /* No multi-function links found */
                 ret = -ENODEV;
@@ -322,7 +322,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
         reg.Value = COR_SOFT_RESET;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
                        dev->name, res);
                 goto done;
@@ -339,7 +339,7 @@ static int sandisk_enable_wireless(struct net_device *dev)
         reg.Value = COR_LEVEL_REQ | 0x8 | COR_ADDR_DECODE | COR_FUNC_ENA;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
                        dev->name, res);
                 goto done;
@@ -374,7 +374,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
         reg.Value = 0;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 1 (%d)\n",
                        res);
                 return;
@@ -386,7 +386,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
         reg.Value |= COR_SOFT_RESET;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 2 (%d)\n",
                        res);
                 return;
@@ -399,7 +399,7 @@ static void prism2_pccard_cor_sreset(local_info_t *local)
                 reg.Value |= COR_IREQ_ENA;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 3 (%d)\n",
                        res);
                 return;
@@ -433,7 +433,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Value = 0;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 1 "
                        "(%d)\n", res);
                 return;
@@ -446,7 +446,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Value |= COR_SOFT_RESET;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 2 "
                        "(%d)\n", res);
                 return;
@@ -460,7 +460,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Offset = CISREG_CCSR;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 3 "
                        "(%d)\n", res);
                 return;
@@ -472,7 +472,7 @@ static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
         reg.Value = old_cor & ~COR_SOFT_RESET;
         res = pcmcia_access_configuration_register(hw_priv->link,
                                                    &reg);
-        if (res != CS_SUCCESS) {
+        if (res != 0) {
                 printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 4 "
                        "(%d)\n", res);
                 return;
@@ -532,145 +532,118 @@ static void prism2_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-#define CFG_CHECK2(fn, retf) \
-do { int _ret = (retf); \
-if (_ret != 0) { \
-        PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", _ret); \
-        cs_error(link, fn, _ret); \
-        goto next_entry; \
-} \
-} while (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_check(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cfg,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
+{
+        if (cfg->index == 0)
+                return -ENODEV;
+
+        PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
+               "(default 0x%02X)\n", cfg->index, dflt->index);
+
+        /* Does this card need audio output? */
+        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
+        }
+
+        /* Use power settings for Vcc and Vpp if present */
+        /*  Note that the CIS values need to be rescaled */
+        if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] /
+                    10000 && !ignore_cis_vcc) {
+                        PDEBUG(DEBUG_EXTRA, "  Vcc mismatch - skipping"
+                               " this entry\n");
+                        return -ENODEV;
+                }
+        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] /
+                    10000 && !ignore_cis_vcc) {
+                        PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "
+                               "- skipping this entry\n");
+                        return -ENODEV;
+                }
+        }
+
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+
+        /* Do we need to allocate an interrupt? */
+        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        else if (!(p_dev->conf.Attributes & CONF_ENABLE_IRQ)) {
+                /* At least Compaq WL200 does not have IRQInfo1 set,
+                 * but it does not work without interrupts.. */
+                printk(KERN_WARNING "Config has no IRQ info, but trying to "
+                       "enable IRQ anyway..\n");
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        }
+
+        /* IO window settings */
+        PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d "
+               "dflt->io.nwin=%d\n",
+               cfg->io.nwin, dflt->io.nwin);
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                PDEBUG(DEBUG_EXTRA, "io->flags = 0x%04X, "
+                       "io.base=0x%04x, len=%d\n", io->flags,
+                       io->win[0].base, io->win[0].len);
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.IOAddrLines = io->flags &
+                        CISTPL_IO_LINES_MASK;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+        }
+
+        /* This reserves IO space but doesn't actually enable it */
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
+
 static int prism2_config(struct pcmcia_device *link)
 {
         struct net_device *dev;
         struct hostap_interface *iface;
         local_info_t *local;
         int ret = 1;
-        tuple_t tuple;
-        cisparse_t *parse;
         int last_fn, last_ret;
-        u_char buf[64];
-        config_info_t conf;
-        cistpl_cftable_entry_t dflt = { 0 };
         struct hostap_cs_priv *hw_priv;
 
         PDEBUG(DEBUG_FLOW, "prism2_config()\n");
 
-        parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
         hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);
-        if (parse == NULL || hw_priv == NULL) {
+        if (hw_priv == NULL) {
                 ret = -ENOMEM;
                 goto failed;
         }
 
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-
-        CS_CHECK(GetConfigurationInfo,
-                 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, &tuple));
-        for (;;) {
-                cistpl_cftable_entry_t *cfg = &(parse->cftable_entry);
-                CFG_CHECK2(GetTupleData,
-                           pcmcia_get_tuple_data(link, &tuple));
-                CFG_CHECK2(ParseTuple,
-                           pcmcia_parse_tuple(link, &tuple, parse));
-
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                        dflt = *cfg;
-                if (cfg->index == 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-                PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
-                       "(default 0x%02X)\n", cfg->index, dflt.index);
-
-                /* Does this card need audio output? */
-                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                        link->conf.Attributes |= CONF_ENABLE_SPKR;
-                        link->conf.Status = CCSR_AUDIO_ENA;
-                }
-
-                /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] /
-                            10000 && !ignore_cis_vcc) {
-                                PDEBUG(DEBUG_EXTRA, "  Vcc mismatch - skipping"
-                                       " this entry\n");
-                                goto next_entry;
-                        }
-                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] /
-                            10000 && !ignore_cis_vcc) {
-                                PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "
-                                       "- skipping this entry\n");
-                                goto next_entry;
-                        }
-                }
-
-                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-
-                /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-                else if (!(link->conf.Attributes & CONF_ENABLE_IRQ)) {
-                        /* At least Compaq WL200 does not have IRQInfo1 set,
-                         * but it does not work without interrupts.. */
-                        printk("Config has no IRQ info, but trying to enable "
-                               "IRQ anyway..\n");
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
-                }
-
-                /* IO window settings */
-                PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d "
-                       "dflt.io.nwin=%d\n",
-                       cfg->io.nwin, dflt.io.nwin);
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        PDEBUG(DEBUG_EXTRA, "io->flags = 0x%04X, "
-                               "io.base=0x%04x, len=%d\n", io->flags,
-                               io->win[0].base, io->win[0].len);
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines = io->flags &
-                                CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 = link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-                }
-
-                /* This reserves IO space but doesn't actually enable it */
-                CFG_CHECK2(RequestIO,
-                           pcmcia_request_io(link, &link->io));
-
-                /* This configuration table entry is OK */
-                break;
-
-        next_entry:
-                CS_CHECK(GetNextTuple,
-                         pcmcia_get_next_tuple(link, &tuple));
+        last_ret = pcmcia_loop_config(link, prism2_config_check, NULL);
+        if (last_ret) {
+                if (!ignore_cis_vcc)
+                        printk(KERN_ERR "GetNextTuple(): No matching "
+                               "CIS configuration.  Maybe you need the "
+                               "ignore_cis_vcc=1 parameter.\n");
+                cs_error(link, RequestIO, last_ret);
+                goto failed;
         }
 
         /* Need to allocate net_device before requesting IRQ handler */
@@ -738,14 +711,12 @@ static int prism2_config(struct pcmcia_device *link)
                 if (ret == 0 && local->ddev)
                         strcpy(hw_priv->node.dev_name, local->ddev->name);
         }
-        kfree(parse);
         return ret;
 
  cs_failed:
         cs_error(link, last_fn, last_ret);
 
  failed:
-        kfree(parse);
         kfree(hw_priv);
         prism2_release((u_long)link);
         return ret;
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index e3505c110af6..842a08d1f106 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -791,7 +791,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
         if ((ret = pcmcia_get_first_tuple(p_dev, &tuple)) != 0 ||
             (ret = pcmcia_get_tuple_data(p_dev, &tuple)) != 0 ||
-            (ret = pcmcia_parse_tuple(p_dev, &tuple, &parse)) != 0)
+            (ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
         {
                 lbs_pr_err("error in pcmcia_get_first_tuple etc\n");
                 goto out1;
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 25bae7933aa5..a670f36b5f3f 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -749,9 +749,10 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
     for (i = j = 0x0; j < 0x400; j += 0x20) {
         link->io.BasePort1 = j ^ 0x300;
         i = pcmcia_request_io(link, &link->io);
-        if (i == CS_SUCCESS) break;
+        if (i == 0)
+                break;
     }
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         cs_error(link, RequestIO, i);
         goto failed;
     }
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 9eaa252c2430..e585684e59a0 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -80,7 +80,7 @@ orinoco_cs_hard_reset(struct orinoco_private *priv)
         /* We need atomic ops here, because we're not holding the lock */
         set_bit(0, &card->hard_reset_in_progress);
 
-        err = pcmcia_reset_card(link, NULL);
+        err = pcmcia_reset_card(link->socket);
         if (err)
                 return err;
 
@@ -165,6 +165,70 @@ static void orinoco_cs_detach(struct pcmcia_device *link)
                 last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; \
         } while (0)
 
+static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
+                                   cistpl_cftable_entry_t *cfg,
+                                   cistpl_cftable_entry_t *dflt,
+                                   unsigned int vcc,
+                                   void *priv_data)
+{
+        if (cfg->index == 0)
+                goto next_entry;
+
+        /* Use power settings for Vcc and Vpp if present */
+        /* Note that the CIS values need to be rescaled */
+        if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        }
+
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+
+        /* Do we need to allocate an interrupt? */
+        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+
+                /* This reserves IO space but doesn't actually enable it */
+                if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                        goto next_entry;
+        }
+        return 0;
+
+next_entry:
+        pcmcia_disable_device(p_dev);
+        return -ENODEV;
+};
+
 static int
 orinoco_cs_config(struct pcmcia_device *link)
 {
@@ -173,16 +237,8 @@ orinoco_cs_config(struct pcmcia_device *link)
         struct orinoco_pccard *card = priv->card;
         hermes_t *hw = &priv->hw;
         int last_fn, last_ret;
-        u_char buf[64];
-        config_info_t conf;
-        tuple_t tuple;
-        cisparse_t parse;
         void __iomem *mem;
 
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link, &conf));
-
         /*
          * In this loop, we scan the CIS for configuration table
          * entries, each of which describes a valid card
@@ -197,94 +253,14 @@ orinoco_cs_config(struct pcmcia_device *link)
          * and most client drivers will only use the CIS to fill in
          * implementation-defined details.
          */
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                cistpl_cftable_entry_t dflt = { .index = 0 };
-
-                if ( (pcmcia_get_tuple_data(link, &tuple) != 0)
-                    || (pcmcia_parse_tuple(link, &tuple, &parse) != 0))
-                        goto next_entry;
-
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                        dflt = *cfg;
-                if (cfg->index == 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-
-                /* Use power settings for Vcc and Vpp if present */
-                /* Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, cfg CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if (!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, dflt CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if(!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                }
-
-                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                
-                /* Do we need to allocate an interrupt? */
-                link->conf.Attributes |= CONF_ENABLE_IRQ;
-
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io =
-                            (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines =
-                            io->flags & CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 =
-                                    link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-
-                        /* This reserves IO space but doesn't actually enable it */
-                        if (pcmcia_request_io(link, &link->io) != 0)
-                                goto next_entry;
-                }
-
-
-                /* If we got this far, we're cool! */
-
-                break;
-                
-        next_entry:
-                pcmcia_disable_device(link);
-                last_ret = pcmcia_get_next_tuple(link, &tuple);
-                if (last_ret  == CS_NO_MORE_ITEMS) {
+        last_ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL);
+        if (last_ret) {
+                if (!ignore_cis_vcc)
                         printk(KERN_ERR PFX "GetNextTuple(): No matching "
                                "CIS configuration.  Maybe you need the "
                                "ignore_cis_vcc=1 parameter.\n");
-                        goto cs_failed;
-                }
+                cs_error(link, RequestIO, last_ret);
+                goto failed;
         }
 
         /*
@@ -335,7 +311,6 @@ orinoco_cs_config(struct pcmcia_device *link)
                "0x%04x-0x%04x\n", dev->name, dev->dev.parent->bus_id,
                link->irq.AssignedIRQ, link->io.BasePort1,
                link->io.BasePort1 + link->io.NumPorts1 - 1);
-
         return 0;
 
  cs_failed:
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 44da0d19b5c8..1404a5717520 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -798,9 +798,9 @@ static void ray_release(struct pcmcia_device *link)
     iounmap(local->amem);
     /* Do bother checking to see if these succeed or not */
     i = pcmcia_release_window(local->amem_handle);
-    if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local->amem) ret = %x\n",i);
+    if ( i != 0 ) DEBUG(0,"ReleaseWindow(local->amem) ret = %x\n",i);
     i = pcmcia_release_window(local->rmem_handle);
-    if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local->rmem) ret = %x\n",i);
+    if ( i != 0 ) DEBUG(0,"ReleaseWindow(local->rmem) ret = %x\n",i);
     pcmcia_disable_device(link);
 
     DEBUG(2,"ray_release ending\n");
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index 67b26d3c3cd5..b0c71c3be467 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -235,6 +235,70 @@ static void spectrum_cs_detach(struct pcmcia_device *link)
  * device available to the system.
  */
 
+static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
+                                    cistpl_cftable_entry_t *cfg,
+                                    cistpl_cftable_entry_t *dflt,
+                                    unsigned int vcc,
+                                    void *priv_data)
+{
+        if (cfg->index == 0)
+                goto next_entry;
+
+        /* Use power settings for Vcc and Vpp if present */
+        /* Note that the CIS values need to be rescaled */
+        if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                        DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n",  vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                        if (!ignore_cis_vcc)
+                                goto next_entry;
+                }
+        }
+
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                p_dev->conf.Vpp =
+                        dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+
+        /* Do we need to allocate an interrupt? */
+        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+
+        /* IO window settings */
+        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                if (!(io->flags & CISTPL_IO_8BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                p_dev->io.BasePort1 = io->win[0].base;
+                p_dev->io.NumPorts1 = io->win[0].len;
+                if (io->nwin > 1) {
+                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->io.NumPorts2 = io->win[1].len;
+                }
+
+                /* This reserves IO space but doesn't actually enable it */
+                if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                        goto next_entry;
+        }
+        return 0;
+
+next_entry:
+        pcmcia_disable_device(p_dev);
+        return -ENODEV;
+};
+
 static int
 spectrum_cs_config(struct pcmcia_device *link)
 {
@@ -243,16 +307,8 @@ spectrum_cs_config(struct pcmcia_device *link)
         struct orinoco_pccard *card = priv->card;
         hermes_t *hw = &priv->hw;
         int last_fn, last_ret;
-        u_char buf[64];
-        config_info_t conf;
-        tuple_t tuple;
-        cisparse_t parse;
         void __iomem *mem;
 
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo,
-                 pcmcia_get_configuration_info(link, &conf));
-
         /*
          * In this loop, we scan the CIS for configuration table
          * entries, each of which describes a valid card
@@ -267,94 +323,14 @@ spectrum_cs_config(struct pcmcia_device *link)
          * and most client drivers will only use the CIS to fill in
          * implementation-defined details.
          */
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-                cistpl_cftable_entry_t dflt = { .index = 0 };
-
-                if ( (pcmcia_get_tuple_data(link, &tuple) != 0)
-                    || (pcmcia_parse_tuple(link, &tuple, &parse) != 0))
-                        goto next_entry;
-
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                        dflt = *cfg;
-                if (cfg->index == 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = cfg->index;
-
-                /* Use power settings for Vcc and Vpp if present */
-                /* Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if (!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                                DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
-                                if(!ignore_cis_vcc)
-                                        goto next_entry;
-                        }
-                }
-
-                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-                        link->conf.Vpp =
-                            dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                
-                /* Do we need to allocate an interrupt? */
-                link->conf.Attributes |= CONF_ENABLE_IRQ;
-
-                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
-                        cistpl_io_t *io =
-                            (cfg->io.nwin) ? &cfg->io : &dflt.io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_16;
-                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 =
-                                    IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines =
-                            io->flags & CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
-                        if (io->nwin > 1) {
-                                link->io.Attributes2 =
-                                    link->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
-                        }
-
-                        /* This reserves IO space but doesn't actually enable it */
-                        if (pcmcia_request_io(link, &link->io) != 0)
-                                goto next_entry;
-                }
-
-
-                /* If we got this far, we're cool! */
-
-                break;
-                
-        next_entry:
-                pcmcia_disable_device(link);
-                last_ret = pcmcia_get_next_tuple(link, &tuple);
-                if (last_ret  == CS_NO_MORE_ITEMS) {
+        last_ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL);
+        if (last_ret) {
+                if (!ignore_cis_vcc)
                         printk(KERN_ERR PFX "GetNextTuple(): No matching "
                                "CIS configuration.  Maybe you need the "
                                "ignore_cis_vcc=1 parameter.\n");
-                        goto cs_failed;
-                }
+                cs_error(link, RequestIO, last_ret);
+                goto failed;
         }
 
         /*
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index b5de38a9b791..e124b1d6267a 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -3702,7 +3702,7 @@ wv_pcmcia_reset(struct net_device *	dev)
 #endif
 
   i = pcmcia_access_configuration_register(link, &reg);
-  if(i != CS_SUCCESS)
+  if (i != 0)
     {
       cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
@@ -3716,7 +3716,7 @@ wv_pcmcia_reset(struct net_device *	dev)
   reg.Action = CS_WRITE;
   reg.Value = reg.Value | COR_SW_RESET;
   i = pcmcia_access_configuration_register(link, &reg);
-  if(i != CS_SUCCESS)
+  if (i != 0)
     {
       cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
@@ -3725,7 +3725,7 @@ wv_pcmcia_reset(struct net_device *	dev)
   reg.Action = CS_WRITE;
   reg.Value = COR_LEVEL_IRQ | COR_CONFIG;
   i = pcmcia_access_configuration_register(link, &reg);
-  if(i != CS_SUCCESS)
+  if (i != 0)
     {
       cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
@@ -3903,7 +3903,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
   do
     {
       i = pcmcia_request_io(link, &link->io);
-      if(i != CS_SUCCESS)
+      if (i != 0)
         {
           cs_error(link, RequestIO, i);
           break;
@@ -3914,7 +3914,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
        * actually assign a handler to the interrupt.
        */
       i = pcmcia_request_irq(link, &link->irq);
-      if(i != CS_SUCCESS)
+      if (i != 0)
         {
           cs_error(link, RequestIRQ, i);
           break;
@@ -3926,7 +3926,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
        */
       link->conf.ConfigIndex = 1;
       i = pcmcia_request_configuration(link, &link->conf);
-      if(i != CS_SUCCESS)
+      if (i != 0)
         {
           cs_error(link, RequestConfiguration, i);
           break;
@@ -3942,7 +3942,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
       req.Base = req.Size = 0;
       req.AccessSpeed = mem_speed;
       i = pcmcia_request_window(&link, &req, &link->win);
-      if(i != CS_SUCCESS)
+      if (i != 0)
         {
           cs_error(link, RequestWindow, i);
           break;
@@ -3954,7 +3954,7 @@ wv_pcmcia_config(struct pcmcia_device *	link)
 
       mem.CardOffset = 0; mem.Page = 0;
       i = pcmcia_map_mem_page(link->win, &mem);
-      if(i != CS_SUCCESS)
+      if (i != 0)
         {
           cs_error(link, MapMemPage, i);
           break;
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 74a5ad2f1223..68789c6e1ce9 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1977,10 +1977,10 @@ static int wl3501_config(struct pcmcia_device *link)
                 link->io.BasePort1 = j;
                 link->io.BasePort2 = link->io.BasePort1 + 0x10;
                 i = pcmcia_request_io(link, &link->io);
-                if (i == CS_SUCCESS)
+                if (i == 0)
                         break;
         }
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
                 cs_error(link, RequestIO, i);
                 goto failed;
         }