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

4 files changed, 79 insertions, 130 deletions

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index f070ae7bd91a..1c5bf99895ed 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1759,65 +1759,40 @@ static void cmm_cm4000_release(struct pcmcia_device * link)
 
 /*==== Interface to PCMCIA Layer =======================================*/
 
+static int cm4000_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->io.nwin)
+                return -ENODEV;
+
+        /* Get the IOaddr */
+        p_dev->io.BasePort1 = cfg->io.win[0].base;
+        p_dev->io.NumPorts1 = cfg->io.win[0].len;
+        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+        if (!(cfg->io.flags & CISTPL_IO_8BIT))
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+        if (!(cfg->io.flags & CISTPL_IO_16BIT))
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+        p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;
+
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
+
 static int cm4000_config(struct pcmcia_device * link, int devno)
 {
         struct cm4000_dev *dev;
-        tuple_t tuple;
-        cisparse_t parse;
-        u_char buf[64];
-        int fail_fn, fail_rc;
-        int rc;
 
         /* read the config-tuples */
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-
-        link->io.BasePort2 = 0;
-        link->io.NumPorts2 = 0;
-        link->io.Attributes2 = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        for (rc = pcmcia_get_first_tuple(link, &tuple);
-             rc == CS_SUCCESS; rc = pcmcia_get_next_tuple(link, &tuple)) {
-
-                rc = pcmcia_get_tuple_data(link, &tuple);
-                if (rc != CS_SUCCESS)
-                        continue;
-                rc = pcmcia_parse_tuple(link, &tuple, &parse);
-                if (rc != CS_SUCCESS)
-                        continue;
-
-                link->conf.ConfigIndex = parse.cftable_entry.index;
-
-                if (!parse.cftable_entry.io.nwin)
-                        continue;
-
-                /* Get the IOaddr */
-                link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-                link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
-                link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                if (!(parse.cftable_entry.io.flags & CISTPL_IO_8BIT))
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                if (!(parse.cftable_entry.io.flags & CISTPL_IO_16BIT))
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                link->io.IOAddrLines = parse.cftable_entry.io.flags
-                    & CISTPL_IO_LINES_MASK;
-
-                rc = pcmcia_request_io(link, &link->io);
-                if (rc == CS_SUCCESS)
-                        break;  /* we are done */
-        }
-        if (rc != CS_SUCCESS)
+        if (pcmcia_loop_config(link, cm4000_config_check, NULL))
                 goto cs_release;
 
         link->conf.IntType = 00000002;
 
-        if ((fail_rc =
-             pcmcia_request_configuration(link, &link->conf)) != CS_SUCCESS) {
-                fail_fn = RequestConfiguration;
+        if (pcmcia_request_configuration(link, &link->conf))
                 goto cs_release;
-        }
 
         dev = link->priv;
         sprintf(dev->node.dev_name, DEVICE_NAME "%d", devno);
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 0b5934bef7a4..2d7c906435b7 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -526,65 +526,49 @@ static void cm4040_reader_release(struct pcmcia_device *link)
         return;
 }
 
-static int reader_config(struct pcmcia_device *link, int devno)
+static int cm4040_config_check(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cfg,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
 {
-        struct reader_dev *dev;
-        tuple_t tuple;
-        cisparse_t parse;
-        u_char buf[64];
-        int fail_fn, fail_rc;
         int rc;
+        if (!cfg->io.nwin)
+                return -ENODEV;
+
+        /* Get the IOaddr */
+        p_dev->io.BasePort1 = cfg->io.win[0].base;
+        p_dev->io.NumPorts1 = cfg->io.win[0].len;
+        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+        if (!(cfg->io.flags & CISTPL_IO_8BIT))
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+        if (!(cfg->io.flags & CISTPL_IO_16BIT))
+                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+        p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;
+
+        rc = pcmcia_request_io(p_dev, &p_dev->io);
+        dev_printk(KERN_INFO, &handle_to_dev(p_dev),
+                   "pcmcia_request_io returned 0x%x\n", rc);
+        return rc;
+}
+
 
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
+static int reader_config(struct pcmcia_device *link, int devno)
+{
+        struct reader_dev *dev;
+        int fail_rc;
 
         link->io.BasePort2 = 0;
         link->io.NumPorts2 = 0;
         link->io.Attributes2 = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        for (rc = pcmcia_get_first_tuple(link, &tuple);
-             rc == CS_SUCCESS;
-             rc = pcmcia_get_next_tuple(link, &tuple)) {
-                rc = pcmcia_get_tuple_data(link, &tuple);
-                if (rc != CS_SUCCESS)
-                        continue;
-                rc = pcmcia_parse_tuple(link, &tuple, &parse);
-                if (rc != CS_SUCCESS)
-                        continue;
-
-                link->conf.ConfigIndex = parse.cftable_entry.index;
-
-                if (!parse.cftable_entry.io.nwin)
-                        continue;
-
-                link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-                link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
-                link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-                if (!(parse.cftable_entry.io.flags & CISTPL_IO_8BIT))
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
-                if (!(parse.cftable_entry.io.flags & CISTPL_IO_16BIT))
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                link->io.IOAddrLines = parse.cftable_entry.io.flags
-                                                & CISTPL_IO_LINES_MASK;
-                rc = pcmcia_request_io(link, &link->io);
-
-                dev_printk(KERN_INFO, &handle_to_dev(link), "foo");
-                if (rc == CS_SUCCESS)
-                        break;
-                else
-                        dev_printk(KERN_INFO, &handle_to_dev(link),
-                                   "pcmcia_request_io failed 0x%x\n", rc);
-        }
-        if (rc != CS_SUCCESS)
+
+        if (pcmcia_loop_config(link, cm4040_config_check, NULL))
                 goto cs_release;
 
         link->conf.IntType = 00000002;
 
-        if ((fail_rc = pcmcia_request_configuration(link,&link->conf))
-                                                                !=CS_SUCCESS) {
-                fail_fn = RequestConfiguration;
+        fail_rc = pcmcia_request_configuration(link, &link->conf);
+        if (fail_rc != 0) {
                 dev_printk(KERN_INFO, &handle_to_dev(link),
                            "pcmcia_request_configuration failed 0x%x\n",
                            fail_rc);
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 5eca7a99afe6..5216fce0c62d 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -65,9 +65,9 @@ static void signalled_reboot_work(struct work_struct *work_reboot)
         struct ipw_dev *ipw = container_of(work_reboot, struct ipw_dev,
                         work_reboot);
         struct pcmcia_device *link = ipw->link;
-        int ret = pccard_reset_card(link->socket);
+        int ret = pcmcia_reset_card(link->socket);
 
-        if (ret != CS_SUCCESS)
+        if (ret != 0)
                 cs_error(link, ResetCard, ret);
 }
 
@@ -83,7 +83,6 @@ static int config_ipwireless(struct ipw_dev *ipw)
 {
         struct pcmcia_device *link = ipw->link;
         int ret;
-        config_info_t conf;
         tuple_t tuple;
         unsigned short buf[64];
         cisparse_t parse;
@@ -105,7 +104,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
         while (ret == 0) {
                 ret = pcmcia_get_tuple_data(link, &tuple);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, GetTupleData, ret);
                         goto exit0;
                 }
@@ -116,21 +115,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_get_first_tuple(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetFirstTuple, ret);
                 goto exit0;
         }
 
         ret = pcmcia_get_tuple_data(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit0;
         }
 
-        ret = pcmcia_parse_tuple(link, &tuple, &parse);
+        ret = pcmcia_parse_tuple(&tuple, &parse);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, ParseTuple, ret);
                 goto exit0;
         }
@@ -152,21 +151,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_get_first_tuple(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetFirstTuple, ret);
                 goto exit0;
         }
 
         ret = pcmcia_get_tuple_data(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit0;
         }
 
-        ret = pcmcia_parse_tuple(link, &tuple, &parse);
+        ret = pcmcia_parse_tuple(&tuple, &parse);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit0;
         }
@@ -181,7 +180,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_request_io(link, &link->io);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, RequestIO, ret);
                 goto exit0;
         }
@@ -195,21 +194,21 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_get_first_tuple(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetFirstTuple, ret);
                 goto exit1;
         }
 
         ret = pcmcia_get_tuple_data(link, &tuple);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, GetTupleData, ret);
                 goto exit1;
         }
 
-        ret = pcmcia_parse_tuple(link, &tuple, &parse);
+        ret = pcmcia_parse_tuple(&tuple, &parse);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, ParseTuple, ret);
                 goto exit1;
         }
@@ -227,7 +226,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_request_window(&link, &ipw->request_common_memory,
                                 &ipw->handle_common_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, RequestWindow, ret);
                         goto exit1;
                 }
@@ -239,7 +238,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_map_mem_page(ipw->handle_common_memory,
                                 &memreq_common_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, MapMemPage, ret);
                         goto exit1;
                 }
@@ -261,7 +260,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_request_window(&link, &ipw->request_attr_memory,
                                 &ipw->handle_attr_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, RequestWindow, ret);
                         goto exit2;
                 }
@@ -272,7 +271,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                 ret = pcmcia_map_mem_page(ipw->handle_attr_memory,
                                 &memreq_attr_memory);
 
-                if (ret != CS_SUCCESS) {
+                if (ret != 0) {
                         cs_error(link, MapMemPage, ret);
                         goto exit2;
                 }
@@ -292,20 +291,11 @@ static int config_ipwireless(struct ipw_dev *ipw)
 
         ret = pcmcia_request_irq(link, &link->irq);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, RequestIRQ, ret);
                 goto exit3;
         }
 
-        /* Look up current Vcc */
-
-        ret = pcmcia_get_configuration_info(link, &conf);
-
-        if (ret != CS_SUCCESS) {
-                cs_error(link, GetConfigurationInfo, ret);
-                goto exit4;
-        }
-
         printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n",
                         ipw->is_v2_card ? "V2/V3" : "V1");
         printk(KERN_INFO IPWIRELESS_PCCARD_NAME
@@ -341,7 +331,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
          */
         ret = pcmcia_request_configuration(link, &link->conf);
 
-        if (ret != CS_SUCCESS) {
+        if (ret != 0) {
                 cs_error(link, RequestConfiguration, ret);
                 goto exit4;
         }
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index c240562c218b..9a626e50b793 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -601,7 +601,7 @@ static int mgslpc_config(struct pcmcia_device *link)
 
     cfg = &(parse.cftable_entry);
     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));
 
     if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
     if (cfg->index == 0)