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

1 files changed, 36 insertions, 44 deletions

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;
     }