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>

1 files changed, 11 insertions, 21 deletions

diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index 670a76bf516..76edd39525d 100644
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -31,8 +31,6 @@ static int ixj_probe(struct pcmcia_device *p_dev)
 {
         dev_dbg(&p_dev->dev, "ixj_attach()\n");
         /* Create new ixj device */
-        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
-        p_dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
         p_dev->priv = kzalloc(sizeof(struct ixj_info_t), GFP_KERNEL);
         if (!p_dev->priv) {
                 return -ENOMEM;
@@ -109,36 +107,28 @@ failed:
         return;
 }
 
-static int ixj_config_check(struct pcmcia_device *p_dev,
-                            cistpl_cftable_entry_t *cfg,
-                            cistpl_cftable_entry_t *dflt,
-                            void *priv_data)
+static int ixj_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
-        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
-                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
-                p_dev->resource[0]->start = io->win[0].base;
-                p_dev->resource[0]->end = io->win[0].len;
-                p_dev->io_lines = 3;
-                if (io->nwin == 2) {
-                        p_dev->resource[1]->start = io->win[1].base;
-                        p_dev->resource[1]->end = io->win[1].len;
-                }
-                if (!pcmcia_request_io(p_dev))
-                        return 0;
-        }
-        return -ENODEV;
+        p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+        p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+        p_dev->resource[1]->flags &= ~IO_DATA_PATH_WIDTH;
+        p_dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
+        p_dev->io_lines = 3;
+
+        return pcmcia_request_io(p_dev);
 }
 
 static int ixj_config(struct pcmcia_device * link)
 {
         IXJ *j;
         ixj_info_t *info;
-        cistpl_cftable_entry_t dflt = { 0 };
 
         info = link->priv;
         dev_dbg(&link->dev, "ixj_config\n");
 
-        if (pcmcia_loop_config(link, ixj_config_check, &dflt))
+        link->config_flags = CONF_AUTO_SET_IO;
+
+        if (pcmcia_loop_config(link, ixj_config_check, NULL))
                 goto failed;
 
         if (pcmcia_enable_device(link))