10 files changed, 215 insertions, 228 deletions

diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 7112fd5e0e1b..08c4dd896077 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -355,9 +355,10 @@ static int tc574_config(struct pcmcia_device *link)
         for (i = j = 0; 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;
         }
@@ -377,7 +378,7 @@ static int tc574_config(struct pcmcia_device *link)
         tuple.TupleDataMax = 64;
         tuple.TupleOffset = 0;
         tuple.DesiredTuple = 0x88;
-        if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
+        if (pcmcia_get_first_tuple(link, &tuple) == 0) {
                 pcmcia_get_tuple_data(link, &tuple);
                 for (i = 0; i < 3; i++)
                         phys_addr[i] = htons(le16_to_cpu(buf[i]));
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 29bd8532d323..c235cdba69c6 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -278,9 +278,10 @@ static int tc589_config(struct pcmcia_device *link)
         if (multi && (j & 0x80)) continue;
         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;
     }
@@ -295,7 +296,7 @@ static int tc589_config(struct pcmcia_device *link)
     /* The 3c589 has an extra EEPROM for configuration info, including
        the hardware address.  The 3c562 puts the address in the CIS. */
     tuple.DesiredTuple = 0x88;
-    if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
+    if (pcmcia_get_first_tuple(link, &tuple) == 0) {
         pcmcia_get_tuple_data(link, &tuple);
         for (i = 0; i < 3; i++)
             phys_addr[i] = htons(le16_to_cpu(buf[i]));
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 52bf11b73c6e..b37a498939ae 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -262,7 +262,7 @@ static int try_io_port(struct pcmcia_device *link)
         if (link->io.NumPorts2 > 0) {
             /* for master/slave multifunction cards */
             link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
-            link->irq.Attributes = 
+            link->irq.Attributes =
                 IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
         }
     } else {
@@ -276,7 +276,8 @@ static int try_io_port(struct pcmcia_device *link)
             link->io.BasePort1 = j ^ 0x300;
             link->io.BasePort2 = (j ^ 0x300) + 0x10;
             ret = pcmcia_request_io(link, &link->io);
-            if (ret == CS_SUCCESS) return ret;
+            if (ret == 0)
+                    return ret;
         }
         return ret;
     } else {
@@ -284,59 +285,50 @@ static int try_io_port(struct pcmcia_device *link)
     }
 }
 
+static int axnet_configcheck(struct pcmcia_device *p_dev,
+                             cistpl_cftable_entry_t *cfg,
+                             cistpl_cftable_entry_t *dflt,
+                             unsigned int vcc,
+                             void *priv_data)
+{
+        int i;
+        cistpl_io_t *io = &cfg->io;
+
+        if (cfg->index == 0 || cfg->io.nwin == 0)
+                return -ENODEV;
+
+        p_dev->conf.ConfigIndex = 0x05;
+        /* For multifunction cards, by convention, we configure the
+           network function with window 0, and serial with window 1 */
+        if (io->nwin > 1) {
+                i = (io->win[1].len > io->win[0].len);
+                p_dev->io.BasePort2 = io->win[1-i].base;
+                p_dev->io.NumPorts2 = io->win[1-i].len;
+        } else {
+                i = p_dev->io.NumPorts2 = 0;
+        }
+        p_dev->io.BasePort1 = io->win[i].base;
+        p_dev->io.NumPorts1 = io->win[i].len;
+        p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+        if (p_dev->io.NumPorts1 + p_dev->io.NumPorts2 >= 32)
+                return try_io_port(p_dev);
+
+        return -ENODEV;
+}
+
 static int axnet_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     axnet_dev_t *info = PRIV(dev);
-    tuple_t tuple;
-    cisparse_t parse;
     int i, j, last_ret, last_fn;
-    u_short buf[64];
     DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "axnet_config(0x%p)\n", link);
 
-    tuple.Attributes = 0;
-    tuple.TupleData = (cisdata_t *)buf;
-    tuple.TupleDataMax = sizeof(buf);
-    tuple.TupleOffset = 0;
-
     /* don't trust the CIS on this; Linksys got it wrong */
     link->conf.Present = 0x63;
-
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (last_ret == CS_SUCCESS) {
-        cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-        cistpl_io_t *io = &(parse.cftable_entry.io);
-        
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                pcmcia_parse_tuple(link, &tuple, &parse) != 0 ||
-                cfg->index == 0 || cfg->io.nwin == 0)
-            goto next_entry;
-        
-        link->conf.ConfigIndex = 0x05;
-        /* For multifunction cards, by convention, we configure the
-           network function with window 0, and serial with window 1 */
-        if (io->nwin > 1) {
-            i = (io->win[1].len > io->win[0].len);
-            link->io.BasePort2 = io->win[1-i].base;
-            link->io.NumPorts2 = io->win[1-i].len;
-        } else {
-            i = link->io.NumPorts2 = 0;
-        }
-        link->io.BasePort1 = io->win[i].base;
-        link->io.NumPorts1 = io->win[i].len;
-        link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-        if (link->io.NumPorts1 + link->io.NumPorts2 >= 32) {
-            last_ret = try_io_port(link);
-            if (last_ret == CS_SUCCESS) break;
-        }
-    next_entry:
-        last_ret = pcmcia_get_next_tuple(link, &tuple);
-    }
-    if (last_ret != CS_SUCCESS) {
+    last_ret = pcmcia_loop_config(link, axnet_configcheck, NULL);
+    if (last_ret != 0) {
         cs_error(link, RequestIO, last_ret);
         goto failed;
     }
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index ea9414c4d900..831090c75622 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -260,21 +260,21 @@ static int com20020_config(struct pcmcia_device *link)
     DEBUG(0, "com20020_config(0x%p)\n", link);
 
     DEBUG(1,"arcnet: baseport1 is %Xh\n", link->io.BasePort1);
-    i = !CS_SUCCESS;
+    i = -ENODEV;
     if (!link->io.BasePort1)
     {
         for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10)
         {
             link->io.BasePort1 = ioaddr;
             i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS)
+            if (i == 0)
                 break;
         }
     }
     else
         i = pcmcia_request_io(link, &link->io);
     
-    if (i != CS_SUCCESS)
+    if (i != 0)
     {
         DEBUG(1,"arcnet: requestIO failed totally!\n");
         goto failed;
@@ -287,7 +287,7 @@ static int com20020_config(struct pcmcia_device *link)
            link->irq.AssignedIRQ,
            link->irq.IRQInfo1, link->irq.IRQInfo2);
     i = pcmcia_request_irq(link, &link->irq);
-    if (i != CS_SUCCESS)
+    if (i != 0)
     {
         DEBUG(1,"arcnet: requestIRQ failed totally!\n");
         goto failed;
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index a550c9bd126f..69d916daa7bb 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -309,7 +309,8 @@ static int mfc_try_io_port(struct pcmcia_device *link)
             printk(KERN_NOTICE "fmvj18x_cs: out of resource for serial\n");
         }
         ret = pcmcia_request_io(link, &link->io);
-        if (ret == CS_SUCCESS) return ret;
+        if (ret == 0)
+                return ret;
     }
     return ret;
 }
@@ -325,7 +326,7 @@ static int ungermann_try_io_port(struct pcmcia_device *link)
     for (ioaddr = 0x300; ioaddr < 0x3e0; ioaddr += 0x20) {
         link->io.BasePort1 = ioaddr;
         ret = pcmcia_request_io(link, &link->io);
-        if (ret == CS_SUCCESS) {
+        if (ret == 0) {
             /* calculate ConfigIndex value */
             link->conf.ConfigIndex = 
                 ((link->io.BasePort1 & 0x0f0) >> 3) | 0x22;
@@ -356,12 +357,12 @@ static int fmvj18x_config(struct pcmcia_device *link)
     tuple.TupleOffset = 0;
     tuple.DesiredTuple = CISTPL_FUNCE;
     tuple.TupleOffset = 0;
-    if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
+    if (pcmcia_get_first_tuple(link, &tuple) == 0) {
         /* Yes, I have CISTPL_FUNCE. Let's check CISTPL_MANFID */
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
         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));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(&tuple, &parse));
         link->conf.ConfigIndex = parse.cftable_entry.index;
         switch (link->manf_id) {
         case MANFID_TDK:
@@ -430,10 +431,10 @@ static int fmvj18x_config(struct pcmcia_device *link)
         link->irq.Attributes =
                 IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED|IRQ_HANDLE_PRESENT;
         ret = mfc_try_io_port(link);
-        if (ret != CS_SUCCESS) goto cs_failed;
+        if (ret != 0) goto cs_failed;
     } else if (cardtype == UNGERMANN) {
         ret = ungermann_try_io_port(link);
-        if (ret != CS_SUCCESS) goto cs_failed;
+        if (ret != 0) goto cs_failed;
     } else { 
         CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
     }
@@ -565,7 +566,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)
     req.Base = 0; req.Size = 0;
     req.AccessSpeed = 0;
     i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         cs_error(link, RequestWindow, i);
         return -1;
     }
@@ -599,7 +600,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)
 
     iounmap(base);
     j = pcmcia_release_window(link->win);
-    if (j != CS_SUCCESS)
+    if (j != 0)
         cs_error(link, ReleaseWindow, j);
     return (i != 0x200) ? 0 : -1;
 
@@ -620,7 +621,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link)
     req.Base = 0; req.Size = 0;
     req.AccessSpeed = 0;
     i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         cs_error(link, RequestWindow, i);
         return -1;
     }
@@ -642,7 +643,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link)
 
     iounmap(base);
     j = pcmcia_release_window(link->win);
-    if (j != CS_SUCCESS)
+    if (j != 0)
         cs_error(link, ReleaseWindow, j);
     return 0;
 
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index 4eafa4f42cff..cf3cca4642f2 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -238,7 +238,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link)
     /* Try PRIMARY card at 0xA20-0xA23 */
     link->io.BasePort1 = 0xA20;
     i = pcmcia_request_io(link, &link->io);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         /* Couldn't get 0xA20-0xA23.  Try ALTERNATE at 0xA24-0xA27. */
         link->io.BasePort1 = 0xA24;
         CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index ee5dcbfd0ba9..448cd40aeba5 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -925,7 +925,7 @@ static void mace_tx_timeout(struct net_device *dev)
   printk(KERN_NOTICE "%s: transmit timed out -- ", dev->name);
 #if RESET_ON_TIMEOUT
   printk("resetting card\n");
-  pcmcia_reset_card(link, NULL);
+  pcmcia_reset_card(link->socket);
 #else /* #if RESET_ON_TIMEOUT */
   printk("NOT resetting card\n");
 #endif /* #if RESET_ON_TIMEOUT */
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index ebc1ae6bcbe5..e40d6301aa7a 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -310,7 +310,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)
     req.Base = 0; req.Size = 0;
     req.AccessSpeed = 0;
     i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         cs_error(link, RequestWindow, i);
         return NULL;
     }
@@ -333,7 +333,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)
 
     iounmap(virt);
     j = pcmcia_release_window(link->win);
-    if (j != CS_SUCCESS)
+    if (j != 0)
         cs_error(link, ReleaseWindow, j);
     return (i < NR_INFO) ? hw_info+i : NULL;
 } /* get_hwinfo */
@@ -504,7 +504,8 @@ static int try_io_port(struct pcmcia_device *link)
             link->io.BasePort1 = j ^ 0x300;
             link->io.BasePort2 = (j ^ 0x300) + 0x10;
             ret = pcmcia_request_io(link, &link->io);
-            if (ret == CS_SUCCESS) return ret;
+            if (ret == 0)
+                    return ret;
         }
         return ret;
     } else {
@@ -512,58 +513,53 @@ static int try_io_port(struct pcmcia_device *link)
     }
 }
 
+static int pcnet_confcheck(struct pcmcia_device *p_dev,
+                           cistpl_cftable_entry_t *cfg,
+                           cistpl_cftable_entry_t *dflt,
+                           unsigned int vcc,
+                           void *priv_data)
+{
+        int *has_shmem = priv_data;
+        int i;
+        cistpl_io_t *io = &cfg->io;
+
+        if (cfg->index == 0 || cfg->io.nwin == 0)
+                return -EINVAL;
+
+        /* For multifunction cards, by convention, we configure the
+           network function with window 0, and serial with window 1 */
+        if (io->nwin > 1) {
+                i = (io->win[1].len > io->win[0].len);
+                p_dev->io.BasePort2 = io->win[1-i].base;
+                p_dev->io.NumPorts2 = io->win[1-i].len;
+        } else {
+                i = p_dev->io.NumPorts2 = 0;
+        }
+
+        *has_shmem = ((cfg->mem.nwin == 1) &&
+                      (cfg->mem.win[0].len >= 0x4000));
+        p_dev->io.BasePort1 = io->win[i].base;
+        p_dev->io.NumPorts1 = io->win[i].len;
+        p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+        if (p_dev->io.NumPorts1 + p_dev->io.NumPorts2 >= 32)
+                return try_io_port(p_dev);
+
+        return 0;
+}
+
 static int pcnet_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     pcnet_dev_t *info = PRIV(dev);
-    tuple_t tuple;
-    cisparse_t parse;
-    int i, last_ret, last_fn, start_pg, stop_pg, cm_offset;
+    int last_ret, last_fn, start_pg, stop_pg, cm_offset;
     int has_shmem = 0;
-    u_short buf[64];
     hw_info_t *local_hw_info;
     DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "pcnet_config(0x%p)\n", link);
 
-    tuple.TupleData = (cisdata_t *)buf;
-    tuple.TupleDataMax = sizeof(buf);
-    tuple.TupleOffset = 0;
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (last_ret == CS_SUCCESS) {
-        cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
-        cistpl_io_t *io = &(parse.cftable_entry.io);
-
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                        pcmcia_parse_tuple(link, &tuple, &parse) != 0 ||
-                        cfg->index == 0 || cfg->io.nwin == 0)
-                goto next_entry;
-
-        link->conf.ConfigIndex = cfg->index;
-        /* For multifunction cards, by convention, we configure the
-           network function with window 0, and serial with window 1 */
-        if (io->nwin > 1) {
-            i = (io->win[1].len > io->win[0].len);
-            link->io.BasePort2 = io->win[1-i].base;
-            link->io.NumPorts2 = io->win[1-i].len;
-        } else {
-            i = link->io.NumPorts2 = 0;
-        }
-        has_shmem = ((cfg->mem.nwin == 1) &&
-                     (cfg->mem.win[0].len >= 0x4000));
-        link->io.BasePort1 = io->win[i].base;
-        link->io.NumPorts1 = io->win[i].len;
-        link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-        if (link->io.NumPorts1 + link->io.NumPorts2 >= 32) {
-            last_ret = try_io_port(link);
-            if (last_ret == CS_SUCCESS) break;
-        }
-    next_entry:
-        last_ret = pcmcia_get_next_tuple(link, &tuple);
-    }
-    if (last_ret != CS_SUCCESS) {
+    last_ret = pcmcia_loop_config(link, pcnet_confcheck, &has_shmem);
+    if (last_ret) {
         cs_error(link, RequestIO, last_ret);
         goto failed;
     }
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 250eb1954c34..c74d6656d266 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -409,10 +409,13 @@ static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
 {
         int i;
 
-        if ((i = pcmcia_get_first_tuple(handle, tuple)) != CS_SUCCESS ||
-                        (i = pcmcia_get_tuple_data(handle, tuple)) != CS_SUCCESS)
+        i = pcmcia_get_first_tuple(handle, tuple);
+        if (i != 0)
                 return i;
-        return pcmcia_parse_tuple(handle, tuple, parse);
+        i = pcmcia_get_tuple_data(handle, tuple);
+        if (i != 0)
+                return i;
+        return pcmcia_parse_tuple(tuple, parse);
 }
 
 static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
@@ -420,10 +423,10 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
 {
         int i;
 
-        if ((i = pcmcia_get_next_tuple(handle, tuple)) != CS_SUCCESS ||
-                        (i = pcmcia_get_tuple_data(handle, tuple)) != CS_SUCCESS)
+        if ((i = pcmcia_get_next_tuple(handle, tuple)) != 0 ||
+                        (i = pcmcia_get_tuple_data(handle, tuple)) != 0)
                 return i;
-        return pcmcia_parse_tuple(handle, tuple, parse);
+        return pcmcia_parse_tuple(tuple, parse);
 }
 
 /*======================================================================
@@ -459,27 +462,36 @@ static int mhz_3288_power(struct pcmcia_device *link)
     return 0;
 }
 
+static int mhz_mfc_config_check(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cf,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
+{
+        int k;
+        p_dev->io.BasePort2 = cf->io.win[0].base;
+        for (k = 0; k < 0x400; k += 0x10) {
+                if (k & 0x80)
+                        continue;
+                p_dev->io.BasePort1 = k ^ 0x300;
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -ENODEV;
+}
+
 static int mhz_mfc_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     struct smc_private *smc = netdev_priv(dev);
     struct smc_cfg_mem *cfg_mem;
-    tuple_t *tuple;
-    cisparse_t *parse;
-    cistpl_cftable_entry_t *cf;
-    u_char *buf;
     win_req_t req;
     memreq_t mem;
-    int i, k;
+    int i;
 
     cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);
     if (!cfg_mem)
-        return CS_OUT_OF_RESOURCE;
-
-    tuple = &cfg_mem->tuple;
-    parse = &cfg_mem->parse;
-    cf = &parse->cftable_entry;
-    buf = cfg_mem->buf;
+            return -ENOMEM;
 
     link->conf.Attributes |= CONF_ENABLE_SPKR;
     link->conf.Status = CCSR_AUDIO_ENA;
@@ -489,27 +501,9 @@ static int mhz_mfc_config(struct pcmcia_device *link)
     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
     link->io.NumPorts2 = 8;
 
-    tuple->Attributes = tuple->TupleOffset = 0;
-    tuple->TupleData = (cisdata_t *)buf;
-    tuple->TupleDataMax = 255;
-    tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
-
-    i = first_tuple(link, tuple, parse);
     /* The Megahertz combo cards have modem-like CIS entries, so
        we have to explicitly try a bunch of port combinations. */
-    while (i == CS_SUCCESS) {
-        link->conf.ConfigIndex = cf->index;
-        link->io.BasePort2 = cf->io.win[0].base;
-        for (k = 0; k < 0x400; k += 0x10) {
-            if (k & 0x80) continue;
-            link->io.BasePort1 = k ^ 0x300;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-        }
-        if (i == CS_SUCCESS) break;
-        i = next_tuple(link, tuple, parse);
-    }
-    if (i != CS_SUCCESS)
+    if (pcmcia_loop_config(link, mhz_mfc_config_check, NULL))
         goto free_cfg_mem;
     dev->base_addr = link->io.BasePort1;
 
@@ -518,7 +512,7 @@ static int mhz_mfc_config(struct pcmcia_device *link)
     req.Base = req.Size = 0;
     req.AccessSpeed = 0;
     i = pcmcia_request_window(&link, &req, &link->win);
-    if (i != CS_SUCCESS)
+    if (i != 0)
         goto free_cfg_mem;
     smc->base = ioremap(req.Base, req.Size);
     mem.CardOffset = mem.Page = 0;
@@ -526,14 +520,14 @@ static int mhz_mfc_config(struct pcmcia_device *link)
         mem.CardOffset = link->conf.ConfigBase;
     i = pcmcia_map_mem_page(link->win, &mem);
 
-    if ((i == CS_SUCCESS)
+    if ((i == 0)
         && (smc->manfid == MANFID_MEGAHERTZ)
         && (smc->cardid == PRODID_MEGAHERTZ_EM3288))
         mhz_3288_power(link);
 
 free_cfg_mem:
     kfree(cfg_mem);
-    return i;
+    return -ENODEV;
 }
 
 static int mhz_setup(struct pcmcia_device *link)
@@ -560,12 +554,12 @@ static int mhz_setup(struct pcmcia_device *link)
     /* Read the station address from the CIS.  It is stored as the last
        (fourth) string in the Version 1 Version/ID tuple. */
     tuple->DesiredTuple = CISTPL_VERS_1;
-    if (first_tuple(link, tuple, parse) != CS_SUCCESS) {
+    if (first_tuple(link, tuple, parse) != 0) {
         rc = -1;
         goto free_cfg_mem;
     }
     /* Ugh -- the EM1144 card has two VERS_1 tuples!?! */
-    if (next_tuple(link, tuple, parse) != CS_SUCCESS)
+    if (next_tuple(link, tuple, parse) != 0)
         first_tuple(link, tuple, parse);
     if (parse->version_1.ns > 3) {
         station_addr = parse->version_1.str + parse->version_1.ofs[3];
@@ -577,11 +571,11 @@ static int mhz_setup(struct pcmcia_device *link)
 
     /* Another possibility: for the EM3288, in a special tuple */
     tuple->DesiredTuple = 0x81;
-    if (pcmcia_get_first_tuple(link, tuple) != CS_SUCCESS) {
+    if (pcmcia_get_first_tuple(link, tuple) != 0) {
         rc = -1;
         goto free_cfg_mem;
     }
-    if (pcmcia_get_tuple_data(link, tuple) != CS_SUCCESS) {
+    if (pcmcia_get_tuple_data(link, tuple) != 0) {
         rc = -1;
         goto free_cfg_mem;
     }
@@ -660,46 +654,27 @@ static int mot_setup(struct pcmcia_device *link)
 
 /*====================================================================*/
 
+static int smc_configcheck(struct pcmcia_device *p_dev,
+                           cistpl_cftable_entry_t *cf,
+                           cistpl_cftable_entry_t *dflt,
+                           unsigned int vcc,
+                           void *priv_data)
+{
+        p_dev->io.BasePort1 = cf->io.win[0].base;
+        p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
+
 static int smc_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
-    struct smc_cfg_mem *cfg_mem;
-    tuple_t *tuple;
-    cisparse_t *parse;
-    cistpl_cftable_entry_t *cf;
-    u_char *buf;
     int i;
 
-    cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);
-    if (!cfg_mem)
-        return CS_OUT_OF_RESOURCE;
-
-    tuple = &cfg_mem->tuple;
-    parse = &cfg_mem->parse;
-    cf = &parse->cftable_entry;
-    buf = cfg_mem->buf;
-
-    tuple->Attributes = tuple->TupleOffset = 0;
-    tuple->TupleData = (cisdata_t *)buf;
-    tuple->TupleDataMax = 255;
-    tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
-
     link->io.NumPorts1 = 16;
-    i = first_tuple(link, tuple, parse);
-    while (i != CS_NO_MORE_ITEMS) {
-        if (i == CS_SUCCESS) {
-            link->conf.ConfigIndex = cf->index;
-            link->io.BasePort1 = cf->io.win[0].base;
-            link->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-        }
-        i = next_tuple(link, tuple, parse);
-    }
-    if (i == CS_SUCCESS)
-        dev->base_addr = link->io.BasePort1;
+    i = pcmcia_loop_config(link, smc_configcheck, NULL);
+    if (!i)
+            dev->base_addr = link->io.BasePort1;
 
-    kfree(cfg_mem);
     return i;
 }
 
@@ -715,7 +690,7 @@ static int smc_setup(struct pcmcia_device *link)
 
     cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);
     if (!cfg_mem)
-        return CS_OUT_OF_RESOURCE;
+            return -ENOMEM;
 
     tuple = &cfg_mem->tuple;
     parse = &cfg_mem->parse;
@@ -728,12 +703,12 @@ static int smc_setup(struct pcmcia_device *link)
     /* Check for a LAN function extension tuple */
     tuple->DesiredTuple = CISTPL_FUNCE;
     i = first_tuple(link, tuple, parse);
-    while (i == CS_SUCCESS) {
+    while (i == 0) {
         if (parse->funce.type == CISTPL_FUNCE_LAN_NODE_ID)
             break;
         i = next_tuple(link, tuple, parse);
     }
-    if (i == CS_SUCCESS) {
+    if (i == 0) {
         node_id = (cistpl_lan_node_id_t *)parse->funce.data;
         if (node_id->nb == 6) {
             for (i = 0; i < 6; i++)
@@ -780,9 +755,10 @@ static int osi_config(struct pcmcia_device *link)
     for (i = j = 0; j < 4; j++) {
         link->io.BasePort2 = com[j];
         i = pcmcia_request_io(link, &link->io);
-        if (i == CS_SUCCESS) break;
+        if (i == 0)
+                break;
     }
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         /* Fallback: turn off hard decode */
         link->conf.ConfigIndex = 0x03;
         link->io.NumPorts2 = 0;
@@ -815,13 +791,13 @@ static int osi_setup(struct pcmcia_device *link, u_short manfid, u_short cardid)
     /* Read the station address from tuple 0x90, subtuple 0x04 */
     tuple->DesiredTuple = 0x90;
     i = pcmcia_get_first_tuple(link, tuple);
-    while (i == CS_SUCCESS) {
+    while (i == 0) {
         i = pcmcia_get_tuple_data(link, tuple);
-        if ((i != CS_SUCCESS) || (buf[0] == 0x04))
+        if ((i != 0) || (buf[0] == 0x04))
             break;
         i = pcmcia_get_next_tuple(link, tuple);
     }
-    if (i != CS_SUCCESS) {
+    if (i != 0) {
         rc = -1;
         goto free_cfg_mem;
     }
@@ -959,8 +935,11 @@ static int check_sig(struct pcmcia_device *link)
 
 ======================================================================*/
 
-#define CS_EXIT_TEST(ret, svc, label) \
-if (ret != CS_SUCCESS) { cs_error(link, svc, ret); goto label; }
+#define CS_EXIT_TEST(ret, svc, label)   \
+if (ret != 0) {                         \
+        cs_error(link, svc, ret);       \
+        goto label;                     \
+}
 
 static int smc91c92_config(struct pcmcia_device *link)
 {
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index c33a3d523566..e1fd585e7131 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -377,7 +377,7 @@ first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
 
         if ((err = pcmcia_get_first_tuple(handle, tuple)) == 0 &&
                         (err = pcmcia_get_tuple_data(handle, tuple)) == 0)
-                err = pcmcia_parse_tuple(handle, tuple, parse);
+                err = pcmcia_parse_tuple(tuple, parse);
         return err;
 }
 
@@ -388,7 +388,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
 
         if ((err = pcmcia_get_next_tuple(handle, tuple)) == 0 &&
                         (err = pcmcia_get_tuple_data(handle, tuple)) == 0)
-                err = pcmcia_parse_tuple(handle, tuple, parse);
+                err = pcmcia_parse_tuple(tuple, parse);
         return err;
 }
 
@@ -715,6 +715,47 @@ has_ce2_string(struct pcmcia_device * p_dev)
         return 0;
 }
 
+static int
+xirc2ps_config_modem(struct pcmcia_device *p_dev,
+                     cistpl_cftable_entry_t *cf,
+                     cistpl_cftable_entry_t *dflt,
+                     unsigned int vcc,
+                     void *priv_data)
+{
+        unsigned int ioaddr;
+
+        if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8) {
+                for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
+                        p_dev->io.BasePort2 = cf->io.win[0].base;
+                        p_dev->io.BasePort1 = ioaddr;
+                        if (!pcmcia_request_io(p_dev, &p_dev->io))
+                                return 0;
+                }
+        }
+        return -ENODEV;
+}
+
+static int
+xirc2ps_config_check(struct pcmcia_device *p_dev,
+                     cistpl_cftable_entry_t *cf,
+                     cistpl_cftable_entry_t *dflt,
+                     unsigned int vcc,
+                     void *priv_data)
+{
+        int *pass = priv_data;
+
+        if (cf->io.nwin > 0 && (cf->io.win[0].base & 0xf) == 8) {
+                p_dev->io.BasePort2 = cf->io.win[0].base;
+                p_dev->io.BasePort1 = p_dev->io.BasePort2
+                        + (*pass ? (cf->index & 0x20 ? -24:8)
+                           : (cf->index & 0x20 ?   8:-24));
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -ENODEV;
+
+}
+
 /****************
  * xirc2ps_config() is scheduled to run after a CARD_INSERTION event
  * is received, to configure the PCMCIA socket, and to make the
@@ -725,13 +766,12 @@ xirc2ps_config(struct pcmcia_device * link)
 {
     struct net_device *dev = link->priv;
     local_info_t *local = netdev_priv(dev);
+    unsigned int ioaddr;
     tuple_t tuple;
     cisparse_t parse;
-    unsigned int ioaddr;
     int err, i;
     u_char buf[64];
     cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data;
-    cistpl_cftable_entry_t *cf = &parse.cftable_entry;
     DECLARE_MAC_BUF(mac);
 
     local->dingo_ccr = NULL;
@@ -846,19 +886,8 @@ xirc2ps_config(struct pcmcia_device * link)
             /* Take the Modem IO port from the CIS and scan for a free
              * Ethernet port */
             link->io.NumPorts1 = 16; /* no Mako stuff anymore */
-            tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-            for (err = first_tuple(link, &tuple, &parse); !err;
-                                 err = next_tuple(link, &tuple, &parse)) {
-                if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8) {
-                    for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
-                        link->conf.ConfigIndex = cf->index ;
-                        link->io.BasePort2 = cf->io.win[0].base;
-                        link->io.BasePort1 = ioaddr;
-                        if (!(err=pcmcia_request_io(link, &link->io)))
-                            goto port_found;
-                    }
-                }
-            }
+            if (!pcmcia_loop_config(link, xirc2ps_config_modem, NULL))
+                    goto port_found;
         } else {
             link->io.NumPorts1 = 18;
             /* We do 2 passes here: The first one uses the regular mapping and
@@ -866,21 +895,9 @@ xirc2ps_config(struct pcmcia_device * link)
              * mirrored every 32 bytes. Actually we use a mirrored port for
              * the Mako if (on the first pass) the COR bit 5 is set.
              */
-            for (pass=0; pass < 2; pass++) {
-                tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-                for (err = first_tuple(link, &tuple, &parse); !err;
-                                     err = next_tuple(link, &tuple, &parse)){
-                    if (cf->io.nwin > 0  &&  (cf->io.win[0].base & 0xf) == 8){
-                        link->conf.ConfigIndex = cf->index ;
-                        link->io.BasePort2 = cf->io.win[0].base;
-                        link->io.BasePort1 = link->io.BasePort2
-                                    + (pass ? (cf->index & 0x20 ? -24:8)
-                                            : (cf->index & 0x20 ?   8:-24));
-                        if (!(err=pcmcia_request_io(link, &link->io)))
+            for (pass=0; pass < 2; pass++)
+                    if (!pcmcia_loop_config(link, xirc2ps_config_check, &pass))
                             goto port_found;
-                    }
-                }
-            }
             /* if special option:
              * try to configure as Ethernet only.
              * .... */