pcmcia: use autoconfiguration feature for ioports and iomem

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / net / wireless / airo_cs.c

diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 63bf662e9c7f6bff8366b41ec024b0ff867ac60c..77682f27772b9887c2be29c661114e6501c3ea0a 100644 (file)
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -137,36 +137,12 @@ static void airo_detach(struct pcmcia_device *link)
 
   ======================================================================*/
 
-static int airo_cs_config_check(struct pcmcia_device *p_dev,
-                               cistpl_cftable_entry_t *cfg,
-                               cistpl_cftable_entry_t *dflt,
-                               void *priv_data)
+static int airo_cs_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
-       if (cfg->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->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)
-               return -ENODEV;
+       if (p_dev->config_index == 0)
+               return -EINVAL;
 
-       /* If we got this far, we're cool! */
-       return 0;
+       return pcmcia_request_io(p_dev);
 }
 
 
@@ -180,7 +156,7 @@ static int airo_config(struct pcmcia_device *link)
        dev_dbg(&link->dev, "airo_config\n");
 
        link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_VPP |
-               CONF_AUTO_AUDIO;
+               CONF_AUTO_AUDIO | CONF_AUTO_SET_IO;
 
        /*
         * In this loop, we scan the CIS for configuration table