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, 74 insertions, 84 deletions

diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index ee6fc30d5e2b..cb199c815b53 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -219,103 +219,91 @@ out_release:
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
+struct pcmcia_config_check {
+        unsigned long ctl_base;
+        int skip_vcc;
+        int is_kme;
+};
+
+static int pcmcia_check_one_config(struct pcmcia_device *pdev,
+                                   cistpl_cftable_entry_t *cfg,
+                                   cistpl_cftable_entry_t *dflt,
+                                   unsigned int vcc,
+                                   void *priv_data)
+{
+        struct pcmcia_config_check *stk = priv_data;
+
+        /* Check for matching Vcc, unless we're desperate */
+        if (!stk->skip_vcc) {
+                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                                return -ENODEV;
+                } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000)
+                                return -ENODEV;
+                }
+        }
+
+        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                pdev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                pdev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+
+        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
+                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                pdev->conf.ConfigIndex = cfg->index;
+                pdev->io.BasePort1 = io->win[0].base;
+                pdev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                if (!(io->flags & CISTPL_IO_16BIT))
+                        pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                if (io->nwin == 2) {
+                        pdev->io.NumPorts1 = 8;
+                        pdev->io.BasePort2 = io->win[1].base;
+                        pdev->io.NumPorts2 = (stk->is_kme) ? 2 : 1;
+                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                                return -ENODEV;
+                        stk->ctl_base = pdev->io.BasePort2;
+                } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
+                        pdev->io.NumPorts1 = io->win[0].len;
+                        pdev->io.NumPorts2 = 0;
+                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                                return -ENODEV;
+                        stk->ctl_base = pdev->io.BasePort1 + 0x0e;
+                } else
+                        return -ENODEV;
+                /* If we've got this far, we're done */
+                return 0;
+        }
+        return -ENODEV;
+}
+
 static int ide_config(struct pcmcia_device *link)
 {
     ide_info_t *info = link->priv;
-    tuple_t tuple;
-    struct {
-        u_short         buf[128];
-        cisparse_t      parse;
-        config_info_t   conf;
-        cistpl_cftable_entry_t dflt;
-    } *stk = NULL;
-    cistpl_cftable_entry_t *cfg;
-    int pass, last_ret = 0, last_fn = 0, is_kme = 0;
+    struct pcmcia_config_check *stk = NULL;
+    int last_ret = 0, last_fn = 0, is_kme = 0;
     unsigned long io_base, ctl_base;
     struct ide_host *host;
 
     DEBUG(0, "ide_config(0x%p)\n", link);
 
-    stk = kzalloc(sizeof(*stk), GFP_KERNEL);
-    if (!stk) goto err_mem;
-    cfg = &stk->parse.cftable_entry;
-
-    tuple.TupleData = (cisdata_t *)&stk->buf;
-    tuple.TupleOffset = 0;
-    tuple.TupleDataMax = 255;
-    tuple.Attributes = 0;
-
     is_kme = ((link->manf_id == MANFID_KME) &&
               ((link->card_id == PRODID_KME_KXLC005_A) ||
                (link->card_id == PRODID_KME_KXLC005_B)));
 
-    /* Not sure if this is right... look up the current Vcc */
-    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &stk->conf));
-
-    pass = io_base = ctl_base = 0;
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (1) {
-        if (pcmcia_get_tuple_data(link, &tuple) != 0) goto next_entry;
-        if (pcmcia_parse_tuple(link, &tuple, &stk->parse) != 0) goto next_entry;
-
-        /* Check for matching Vcc, unless we're desperate */
-        if (!pass) {
-            if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                if (stk->conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000)
-                    goto next_entry;
-            } else if (stk->dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                if (stk->conf.Vcc != stk->dflt.vcc.param[CISTPL_POWER_VNOM] / 10000)
-                    goto next_entry;
-            }
-        }
-
-        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-            link->conf.Vpp =
-                cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-        else if (stk->dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
-            link->conf.Vpp =
-                stk->dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
-
-        if ((cfg->io.nwin > 0) || (stk->dflt.io.nwin > 0)) {
-            cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &stk->dflt.io;
-            link->conf.ConfigIndex = cfg->index;
-            link->io.BasePort1 = io->win[0].base;
-            link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-            if (!(io->flags & CISTPL_IO_16BIT))
-                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-            if (io->nwin == 2) {
-                link->io.NumPorts1 = 8;
-                link->io.BasePort2 = io->win[1].base;
-                link->io.NumPorts2 = (is_kme) ? 2 : 1;
-                if (pcmcia_request_io(link, &link->io) != 0)
-                        goto next_entry;
-                io_base = link->io.BasePort1;
-                ctl_base = link->io.BasePort2;
-            } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
-                link->io.NumPorts1 = io->win[0].len;
-                link->io.NumPorts2 = 0;
-                if (pcmcia_request_io(link, &link->io) != 0)
-                        goto next_entry;
-                io_base = link->io.BasePort1;
-                ctl_base = link->io.BasePort1 + 0x0e;
-            } else goto next_entry;
-            /* If we've got this far, we're done */
-            break;
-        }
-
-    next_entry:
-        if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-            memcpy(&stk->dflt, cfg, sizeof(stk->dflt));
-        if (pass) {
-            CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
-        } else if (pcmcia_get_next_tuple(link, &tuple) != 0) {
-            CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-            memset(&stk->dflt, 0, sizeof(stk->dflt));
-            pass++;
-        }
+    stk = kzalloc(sizeof(*stk), GFP_KERNEL);
+    if (!stk)
+            goto err_mem;
+    stk->is_kme = is_kme;
+    stk->skip_vcc = io_base = ctl_base = 0;
+
+    if (pcmcia_loop_config(link, pcmcia_check_one_config, stk)) {
+            stk->skip_vcc = 1;
+            if (pcmcia_loop_config(link, pcmcia_check_one_config, stk))
+                    goto failed; /* No suitable config found */
     }
+    io_base = link->io.BasePort1;
+    ctl_base = stk->ctl_base;
 
     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
@@ -403,8 +391,10 @@ static struct pcmcia_device_id ide_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x000a, 0x0000),        /* I-O Data CFA */
         PCMCIA_DEVICE_MANF_CARD(0x001c, 0x0001),        /* Mitsubishi CFA */
         PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704),
+        PCMCIA_DEVICE_MANF_CARD(0x0032, 0x2904),
         PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),        /* SanDisk CFA */
         PCMCIA_DEVICE_MANF_CARD(0x004f, 0x0000),        /* Kingston */
+        PCMCIA_DEVICE_MANF_CARD(0x0097, 0x1620),        /* TI emulated */
         PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000),        /* Toshiba */
         PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),
         PCMCIA_DEVICE_MANF_CARD(0x00ce, 0x0000),        /* Samsung */