pcmcia: use autoconfiguration feature for ioports and iomem

When CONF_AUTO_SET_IO or CONF_AUTO_SET_IOMEM are set, the corresponding
fields in struct pcmcia_device *p_dev->resource[0,1,2] are set
accordinly. Drivers wishing to override certain settings may do so in
the callback function, but they no longer need to parse the CIS entries
stored in cistpl_cftable_entry_t themselves.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: linux-bluetooth@vger.kernel.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
CC: linux-scsi@vger.kernel.org
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

5 files changed, 38 insertions, 82 deletions

diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 0b5fc2fa058..bd9ce09b7ff 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -99,9 +99,7 @@ static int aha152x_probe(struct pcmcia_device *link)
     info->p_dev = link;
     link->priv = info;
 
-    link->resource[0]->end = 0x20;
-    link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-    link->config_flags |= CONF_ENABLE_IRQ;
+    link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
     link->config_regs = PRESENT_OPTION;
 
     return aha152x_config_cs(link);
@@ -121,24 +119,24 @@ static void aha152x_detach(struct pcmcia_device *link)
 
 /*====================================================================*/
 
-static int aha152x_config_check(struct pcmcia_device *p_dev,
-                                cistpl_cftable_entry_t *cfg,
-                                cistpl_cftable_entry_t *dflt,
-                                void *priv_data)
+static int aha152x_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
         p_dev->io_lines = 10;
+
         /* For New Media T&J, look for a SCSI window */
-        if (cfg->io.win[0].len >= 0x20)
-                p_dev->resource[0]->start = cfg->io.win[0].base;
-        else if ((cfg->io.nwin > 1) &&
-                 (cfg->io.win[1].len >= 0x20))
-                p_dev->resource[0]->start = cfg->io.win[1].base;
-        if ((cfg->io.nwin > 0) &&
-            (p_dev->resource[0]->start < 0xffff)) {
-                if (!pcmcia_request_io(p_dev))
-                        return 0;
-        }
-        return -EINVAL;
+        if ((p_dev->resource[0]->end < 0x20) &&
+                (p_dev->resource[1]->end >= 0x20))
+                p_dev->resource[0]->start = p_dev->resource[1]->start;
+
+        if (p_dev->resource[0]->start >= 0xffff)
+                return -EINVAL;
+
+        p_dev->resource[1]->start = p_dev->resource[1]->end = 0;
+        p_dev->resource[0]->end = 0x20;
+        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
+
+        return pcmcia_request_io(p_dev);
 }
 
 static int aha152x_config_cs(struct pcmcia_device *link)
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index 3b9f311cb03..f2dc627e9da 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -82,9 +82,7 @@ static int fdomain_probe(struct pcmcia_device *link)
 
         info->p_dev = link;
         link->priv = info;
-        link->resource[0]->end = 0x10;
-        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-        link->config_flags |= CONF_ENABLE_IRQ;
+        link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
         link->config_regs = PRESENT_OPTION;
 
         return fdomain_config(link);
@@ -103,13 +101,12 @@ static void fdomain_detach(struct pcmcia_device *link)
 
 /*====================================================================*/
 
-static int fdomain_config_check(struct pcmcia_device *p_dev,
-                                cistpl_cftable_entry_t *cfg,
-                                cistpl_cftable_entry_t *dflt,
-                                void *priv_data)
+static int fdomain_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
         p_dev->io_lines = 10;
-        p_dev->resource[0]->start = cfg->io.win[0].base;
+        p_dev->resource[0]->end = 0x10;
+        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
         return pcmcia_request_io(p_dev);
 }
 
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 344d49900b4..3b90ad9d195 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1556,13 +1556,6 @@ static int nsp_cs_probe(struct pcmcia_device *link)
 
         nsp_dbg(NSP_DEBUG_INIT, "info=0x%p", info);
 
-        /* The io structure describes IO port mapping */
-        link->resource[0]->end   = 0x10;
-        link->resource[0]->flags = IO_DATA_PATH_WIDTH_AUTO;
-
-        /* General socket configuration */
-        link->config_flags       |= CONF_ENABLE_IRQ;
-
         ret = nsp_cs_config(link);
 
         nsp_dbg(NSP_DEBUG_INIT, "link=0x%p", link);
@@ -1594,50 +1587,27 @@ static void nsp_cs_detach(struct pcmcia_device *link)
     ethernet device available to the system.
 ======================================================================*/
 
-static int nsp_cs_config_check(struct pcmcia_device *p_dev,
-                               cistpl_cftable_entry_t *cfg,
-                               cistpl_cftable_entry_t *dflt,
-                               void *priv_data)
+static int nsp_cs_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
         nsp_hw_data             *data = priv_data;
 
-        if (cfg->index == 0)
+        if (p_dev->config_index == 0)
                 return -ENODEV;
 
-        /* IO window settings */
-        p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
-        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
-                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
-                p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
-                p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-                p_dev->resource[0]->flags |=
-                                        pcmcia_io_cfg_data_width(io->flags);
-                p_dev->resource[0]->start = io->win[0].base;
-                p_dev->resource[0]->end = io->win[0].len;
-                if (io->nwin > 1) {
-                        p_dev->resource[1]->flags = p_dev->resource[0]->flags;
-                        p_dev->resource[1]->start = io->win[1].base;
-                        p_dev->resource[1]->end = io->win[1].len;
-                }
-                /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(p_dev) != 0)
-                        goto next_entry;
-        }
+        /* This reserves IO space but doesn't actually enable it */
+        if (pcmcia_request_io(p_dev) != 0)
+                goto next_entry;
 
-        if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
-                cistpl_mem_t    *mem =
-                        (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
+        if (resource_size(p_dev->resource[2])) {
                 p_dev->resource[2]->flags |= (WIN_DATA_WIDTH_16 |
                                         WIN_MEMORY_TYPE_CM |
                                         WIN_ENABLE);
-                p_dev->resource[2]->start = mem->win[0].host_addr;
-                p_dev->resource[2]->end = mem->win[0].len;
                 if (p_dev->resource[2]->end < 0x1000)
                         p_dev->resource[2]->end = 0x1000;
                 if (pcmcia_request_window(p_dev, p_dev->resource[2], 0) != 0)
                         goto next_entry;
                 if (pcmcia_map_mem_page(p_dev, p_dev->resource[2],
-                                                mem->win[0].card_addr) != 0)
+                                                p_dev->card_addr) != 0)
                         goto next_entry;
 
                 data->MmioAddress = (unsigned long)
@@ -1664,7 +1634,8 @@ static int nsp_cs_config(struct pcmcia_device *link)
         nsp_dbg(NSP_DEBUG_INIT, "in");
 
         link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_CHECK_VCC |
-                CONF_AUTO_SET_VPP | CONF_AUTO_AUDIO;
+                CONF_AUTO_SET_VPP | CONF_AUTO_AUDIO | CONF_AUTO_SET_IOMEM |
+                CONF_AUTO_SET_IO;
 
         ret = pcmcia_loop_config(link, nsp_cs_config_check, data);
         if (ret)
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 468fd12fe98..e8a06e3a384 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -155,9 +155,7 @@ static int qlogic_probe(struct pcmcia_device *link)
                 return -ENOMEM;
         info->p_dev = link;
         link->priv = info;
-        link->resource[0]->end = 16;
-        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-        link->config_flags |= CONF_ENABLE_IRQ;
+        link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
         link->config_regs = PRESENT_OPTION;
 
         return qlogic_config(link);
@@ -176,14 +174,11 @@ static void qlogic_detach(struct pcmcia_device *link)
 
 /*====================================================================*/
 
-static int qlogic_config_check(struct pcmcia_device *p_dev,
-                               cistpl_cftable_entry_t *cfg,
-                               cistpl_cftable_entry_t *dflt,
-                               void *priv_data)
+static int qlogic_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
         p_dev->io_lines = 10;
-        p_dev->resource[0]->start = cfg->io.win[0].base;
-        p_dev->resource[0]->end = cfg->io.win[0].len;
+        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
 
         if (p_dev->resource[0]->start == 0)
                 return -ENODEV;
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 7a0bb9aea04..6ceb57c355f 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -683,14 +683,11 @@ static struct scsi_host_template sym53c500_driver_template = {
      .shost_attrs               = SYM53C500_shost_attrs
 };
 
-static int SYM53C500_config_check(struct pcmcia_device *p_dev,
-                                  cistpl_cftable_entry_t *cfg,
-                                  cistpl_cftable_entry_t *dflt,
-                                  void *priv_data)
+static int SYM53C500_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
         p_dev->io_lines = 10;
-        p_dev->resource[0]->start = cfg->io.win[0].base;
-        p_dev->resource[0]->end = cfg->io.win[0].len;
+        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
 
         if (p_dev->resource[0]->start == 0)
                 return -ENODEV;
@@ -857,9 +854,7 @@ SYM53C500_probe(struct pcmcia_device *link)
                 return -ENOMEM;
         info->p_dev = link;
         link->priv = info;
-        link->resource[0]->end = 16;
-        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-        link->config_flags |= CONF_ENABLE_IRQ;
+        link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
 
         return SYM53C500_config(link);
 } /* SYM53C500_attach */