1 files changed, 23 insertions, 58 deletions

diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index fc6cc2c065b8..23560c897ec3 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -174,38 +174,29 @@ static void avma1cs_detach(struct pcmcia_device *link)
     
 ======================================================================*/
 
-static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
+static int avma1cs_configcheck(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cf,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
 {
-    int i = pcmcia_get_tuple_data(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return pcmcia_parse_tuple(handle, tuple, parse);
+        if (cf->io.nwin <= 0)
+                return -ENODEV;
+
+        p_dev->io.BasePort1 = cf->io.win[0].base;
+        p_dev->io.NumPorts1 = cf->io.win[0].len;
+        p_dev->io.NumPorts2 = 0;
+        printk(KERN_INFO "avma1_cs: testing i/o %#x-%#x\n",
+               p_dev->io.BasePort1,
+               p_dev->io.BasePort1+p_dev->io.NumPorts1-1);
+        return pcmcia_request_io(p_dev, &p_dev->io);
 }
 
-static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
-{
-    int i = pcmcia_get_first_tuple(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return get_tuple(handle, tuple, parse);
-}
-
-static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-                     cisparse_t *parse)
-{
-    int i = pcmcia_get_next_tuple(handle, tuple);
-    if (i != CS_SUCCESS) return i;
-    return get_tuple(handle, tuple, parse);
-}
 
 static int avma1cs_config(struct pcmcia_device *link)
 {
-    tuple_t tuple;
-    cisparse_t parse;
-    cistpl_cftable_entry_t *cf = &parse.cftable_entry;
     local_info_t *dev;
     int i;
-    u_char buf[64];
     char devname[128];
     IsdnCard_t  icard;
     int busy = 0;
@@ -214,45 +205,19 @@ static int avma1cs_config(struct pcmcia_device *link)
 
     DEBUG(0, "avma1cs_config(0x%p)\n", link);
 
-    do {
-        devname[0] = 0;
-        if (link->prod_id[1])
-                strlcpy(devname, link->prod_id[1], sizeof(devname));
+    devname[0] = 0;
+    if (link->prod_id[1])
+            strlcpy(devname, link->prod_id[1], sizeof(devname));
 
-        /*
-         * find IO port
-         */
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        i = first_tuple(link, &tuple, &parse);
-        while (i == CS_SUCCESS) {
-            if (cf->io.nwin > 0) {
-                link->conf.ConfigIndex = cf->index;
-                link->io.BasePort1 = cf->io.win[0].base;
-                link->io.NumPorts1 = cf->io.win[0].len;
-                link->io.NumPorts2 = 0;
-                printk(KERN_INFO "avma1_cs: testing i/o %#x-%#x\n",
-                        link->io.BasePort1,
-                        link->io.BasePort1+link->io.NumPorts1 - 1);
-                i = pcmcia_request_io(link, &link->io);
-                if (i == CS_SUCCESS) goto found_port;
-            }
-            i = next_tuple(link, &tuple, &parse);
-        }
+    if (pcmcia_loop_config(link, avma1cs_configcheck, NULL))
+            return -ENODEV;
 
-found_port:
-        if (i != CS_SUCCESS) {
-            cs_error(link, RequestIO, i);
-            break;
-        }
-        
+    do {
         /*
          * allocate an interrupt line
          */
         i = pcmcia_request_irq(link, &link->irq);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
             cs_error(link, RequestIRQ, i);
             /* undo */
             pcmcia_disable_device(link);
@@ -263,7 +228,7 @@ found_port:
          * configure the PCMCIA socket
          */
         i = pcmcia_request_configuration(link, &link->conf);
-        if (i != CS_SUCCESS) {
+        if (i != 0) {
             cs_error(link, RequestConfiguration, i);
             pcmcia_disable_device(link);
             break;