pcmcia: simplify IntType
authorDominik Brodowski <linux@dominikbrodowski.net>
Thu, 29 Jul 2010 14:33:23 +0000 (16:33 +0200)
committerDominik Brodowski <linux@dominikbrodowski.net>
Wed, 29 Sep 2010 15:20:22 +0000 (17:20 +0200)
IntType was only set to INT_MEMORY (driver pcmciamtd) or INT_MEMORY_AND_IO
(all other drivers). As this flags seems to relate to ioport access, make
it conditional to the driver having requested IO port access. There are two
drivers which do not request IO ports, but did set INT_MEMORY_AND_IO:
ray_cs and b43. For those, we consistently only set INT_MEMORY in future.

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: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> (for drivers/bluetooth)
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
57 files changed:
drivers/ata/pata_pcmcia.c
drivers/bluetooth/bluecard_cs.c
drivers/bluetooth/bt3c_cs.c
drivers/bluetooth/btuart_cs.c
drivers/bluetooth/dtl1_cs.c
drivers/char/pcmcia/cm4000_cs.c
drivers/char/pcmcia/cm4040_cs.c
drivers/char/pcmcia/ipwireless/main.c
drivers/char/pcmcia/synclink_cs.c
drivers/ide/ide-cs.c
drivers/isdn/hardware/avm/avm_cs.c
drivers/isdn/hisax/avma1_cs.c
drivers/isdn/hisax/elsa_cs.c
drivers/isdn/hisax/sedlbauer_cs.c
drivers/isdn/hisax/teles_cs.c
drivers/mtd/maps/pcmciamtd.c
drivers/net/pcmcia/3c574_cs.c
drivers/net/pcmcia/3c589_cs.c
drivers/net/pcmcia/axnet_cs.c
drivers/net/pcmcia/com20020_cs.c
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/ibmtr_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/pcnet_cs.c
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/airo_cs.c
drivers/net/wireless/atmel_cs.c
drivers/net/wireless/b43/pcmcia.c
drivers/net/wireless/hostap/hostap_cs.c
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/orinoco/orinoco_cs.c
drivers/net/wireless/orinoco/spectrum_cs.c
drivers/net/wireless/ray_cs.c
drivers/net/wireless/wl3501_cs.c
drivers/parport/parport_cs.c
drivers/pcmcia/cs_internal.h
drivers/pcmcia/pcmcia_resource.c
drivers/scsi/pcmcia/aha152x_stub.c
drivers/scsi/pcmcia/fdomain_stub.c
drivers/scsi/pcmcia/nsp_cs.c
drivers/scsi/pcmcia/qlogic_stub.c
drivers/scsi/pcmcia/sym53c500_cs.c
drivers/serial/serial_cs.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/comedi/drivers/das08_cs.c
drivers/staging/comedi/drivers/ni_daq_700.c
drivers/staging/comedi/drivers/ni_daq_dio24.c
drivers/staging/comedi/drivers/ni_labpc_cs.c
drivers/staging/comedi/drivers/ni_mio_cs.c
drivers/staging/comedi/drivers/quatech_daqp_cs.c
drivers/staging/wlags49_h2/wl_cs.c
drivers/telephony/ixj_pcmcia.c
drivers/usb/host/sl811_cs.c
include/pcmcia/cs.h
sound/pcmcia/pdaudiocf/pdaudiocf.c
sound/pcmcia/vx/vxpocket.c

index 12cdc9ff39ad9c45ea53f11ab15602d1a7f5aa69..c2679c01188beb457597bd2f3bbd730074f26cfb 100644 (file)
@@ -250,7 +250,6 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
        pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
        pdev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
        pdev->conf.Attributes = CONF_ENABLE_IRQ;
-       pdev->conf.IntType = INT_MEMORY_AND_IO;
 
        /* See if we have a manufacturer identifier. Use it to set is_kme for
           vendor quirks */
index d52e90a5a61750494a6c740e4dd4565fb00f788e..4cb2dfebde80df8ff1ac7be2da7204801ba95cb2 100644 (file)
@@ -866,7 +866,6 @@ static int bluecard_probe(struct pcmcia_device *link)
        link->priv = info;
 
        link->conf.Attributes = CONF_ENABLE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        return bluecard_config(link);
 }
index 2c8d981c110dc3a5fa8c3f23987da23446f2dfb7..fb018073a5f85e690c53c156bae516ceef525c00 100644 (file)
@@ -661,7 +661,6 @@ static int bt3c_probe(struct pcmcia_device *link)
        link->resource[0]->end = 8;
 
        link->conf.Attributes = CONF_ENABLE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        return bt3c_config(link);
 }
index 7ea6fa42fdef1e6709ca08988da44e0ba0459472..897c7c74ca145f58efe37ad3d2923fcb442b408f 100644 (file)
@@ -590,7 +590,6 @@ static int btuart_probe(struct pcmcia_device *link)
        link->resource[0]->end = 8;
 
        link->conf.Attributes = CONF_ENABLE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        return btuart_config(link);
 }
index db7c8db695fc643cff089670b721ef801dd14090..b4c9a2e0a96be4da118810ba39017d26b0f8de67 100644 (file)
@@ -576,7 +576,6 @@ static int dtl1_probe(struct pcmcia_device *link)
        link->resource[0]->end = 8;
 
        link->conf.Attributes = CONF_ENABLE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        return dtl1_config(link);
 }
index ec73d9f6d9ed92c9fa527718ff44871bd7d64669..d2accd64b3f5e1facba69b43e0ac38eaa3ec42bf 100644 (file)
@@ -1767,8 +1767,6 @@ static int cm4000_config(struct pcmcia_device * link, int devno)
        if (pcmcia_loop_config(link, cm4000_config_check, NULL))
                goto cs_release;
 
-       link->conf.IntType = 00000002;
-
        if (pcmcia_request_configuration(link, &link->conf))
                goto cs_release;
 
@@ -1829,7 +1827,6 @@ static int cm4000_probe(struct pcmcia_device *link)
 
        dev->p_dev = link;
        link->priv = dev;
-       link->conf.IntType = INT_MEMORY_AND_IO;
        dev_table[i] = link;
 
        init_waitqueue_head(&dev->devq);
index 815cde1d0570e86d4ba0e8970ef60248997a3302..a32eba0afdfcbeabfd12d5ea543343196b6c8cb7 100644 (file)
@@ -547,8 +547,6 @@ static int reader_config(struct pcmcia_device *link, int devno)
        if (pcmcia_loop_config(link, cm4040_config_check, NULL))
                goto cs_release;
 
-       link->conf.IntType = 00000002;
-
        fail_rc = pcmcia_request_configuration(link, &link->conf);
        if (fail_rc != 0) {
                dev_printk(KERN_INFO, &link->dev,
@@ -599,7 +597,6 @@ static int reader_probe(struct pcmcia_device *link)
        link->priv = dev;
        dev->p_dev = link;
 
-       link->conf.IntType = INT_MEMORY_AND_IO;
        dev_table[i] = link;
 
        init_waitqueue_head(&dev->devq);
index 8d2b86aab715c685c0bd09ed8427bb0bfc2cbe62..0f0be4df7b7c611f53c80661b761c9da17469c46 100644 (file)
@@ -173,7 +173,6 @@ static int config_ipwireless(struct ipw_dev *ipw)
                return ret;
 
        link->conf.Attributes = CONF_ENABLE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        INIT_WORK(&ipw->work_reboot, signalled_reboot_work);
 
index 9ecd6bef5d3b5457ec5bcc6566db7621c1d791f3..ba7ccf5701ed28e12841789ddf167b71243c706c 100644 (file)
@@ -551,7 +551,6 @@ static int mgslpc_probe(struct pcmcia_device *link)
     /* Initialize the struct pcmcia_device structure */
 
     link->conf.Attributes = 0;
-    link->conf.IntType = INT_MEMORY_AND_IO;
 
     ret = mgslpc_config(link);
     if (ret)
@@ -595,7 +594,6 @@ static int mgslpc_config(struct pcmcia_device *link)
            goto failed;
 
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.ConfigIndex = 8;
     link->conf.Present = PRESENT_OPTION;
 
index 82690e4094354f5b273425e5d1d7a00f69c20c7f..cf7cb4953aa5e12a62952496f7278fc1fbbb5b8a 100644 (file)
@@ -100,7 +100,6 @@ static int ide_probe(struct pcmcia_device *link)
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
     link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
 
     return ide_config(link);
 } /* ide_attach */
index 09b1795516f4e95c4e49f0ce6e1e91c9eefa5bd1..938ca4155c3b447b5fa87fbeb8f67e9bfbee6cd4 100644 (file)
@@ -80,7 +80,6 @@ static int avmcs_probe(struct pcmcia_device *p_dev)
 
     /* General socket configuration */
     p_dev->conf.Attributes = CONF_ENABLE_IRQ;
-    p_dev->conf.IntType = INT_MEMORY_AND_IO;
     p_dev->conf.ConfigIndex = 1;
     p_dev->conf.Present = PRESENT_OPTION;
 
index 94263c22b8746965109cc6b1654a8a30df2355fd..7d5ff20b5d5b45de57410f38f74778912fb793da 100644 (file)
@@ -85,7 +85,6 @@ static int __devinit avma1cs_probe(struct pcmcia_device *p_dev)
 
     /* General socket configuration */
     p_dev->conf.Attributes = CONF_ENABLE_IRQ;
-    p_dev->conf.IntType = INT_MEMORY_AND_IO;
     p_dev->conf.ConfigIndex = 1;
     p_dev->conf.Present = PRESENT_OPTION;
 
index b3c08aaf41c410e57c91aaa82fefddc4af6212a8..df360c8b31cb444c15962e89926fbee595a48804 100644 (file)
@@ -130,7 +130,6 @@ static int __devinit elsa_cs_probe(struct pcmcia_device *link)
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
 
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
 
     return elsa_cs_config(link);
 } /* elsa_cs_attach */
index 40001ad9f6142921ec386e5b8f41f854bd43aa2b..169061fbca988da1388c364b8d61352d7355d5e3 100644 (file)
@@ -133,7 +133,6 @@ static int __devinit sedlbauer_probe(struct pcmcia_device *link)
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
 
     link->conf.Attributes = 0;
-    link->conf.IntType = INT_MEMORY_AND_IO;
 
     return sedlbauer_config(link);
 } /* sedlbauer_attach */
index 7296102ca255d89ef34bee0a1736d695629214d2..46e72a1eed2df253647d818d75b582d7cd2282e5 100644 (file)
@@ -110,7 +110,6 @@ static int __devinit teles_probe(struct pcmcia_device *link)
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
 
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
 
     return teles_cs_config(link);
 } /* teles_attach */
index ab94c8aebddcfd265595d856e254ab820edb79b0..663b48bc657ca603d9520bf4ad6188a69d6d620d 100644 (file)
@@ -575,7 +575,6 @@ static int pcmciamtd_config(struct pcmcia_device *link)
                link->vpp = 0;
        }
 
-       link->conf.IntType = INT_MEMORY;
        link->conf.ConfigIndex = 0;
        DEBUG(2, "Setting Configuration");
        ret = pcmcia_request_configuration(link, &link->conf);
@@ -720,7 +719,6 @@ static int pcmciamtd_probe(struct pcmcia_device *link)
        link->priv = dev;
 
        link->conf.Attributes = 0;
-       link->conf.IntType = INT_MEMORY;
 
        return pcmciamtd_config(link);
 }
index c683f77c6f424ebbc873d76f0e07cb386484ea70..41ecb2728a201f6cec8e484e1cbb45c4b7914d68 100644 (file)
@@ -281,7 +281,6 @@ static int tc574_probe(struct pcmcia_device *link)
        link->resource[0]->end = 32;
        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
        link->conf.Attributes = CONF_ENABLE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
        link->conf.ConfigIndex = 1;
 
        dev->netdev_ops = &el3_netdev_ops;
index 61f9cf2100ffd8bfdff824ccfa2c3f3013a8eb1f..68886729375df227f860e0b658ae70f1a0a09315 100644 (file)
@@ -217,7 +217,6 @@ static int tc589_probe(struct pcmcia_device *link)
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
 
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.ConfigIndex = 1;
 
     dev->netdev_ops = &el3_netdev_ops;
index 8734ed8f174df854e40eeda759e8ef6890cb0021..4d4928a22b1fbe44976d6776ba0bd68eae93ded5 100644 (file)
@@ -167,7 +167,6 @@ static int axnet_probe(struct pcmcia_device *link)
     info->p_dev = link;
     link->priv = dev;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
 
     dev->netdev_ops = &axnet_netdev_ops;
 
index 3c400cfa82ae2e88c0e67c3f0582f75491be925e..a58eafed42a5211c9cff30a39ff3f0be9dd399f4 100644 (file)
@@ -161,7 +161,6 @@ static int com20020_probe(struct pcmcia_device *p_dev)
     p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
     p_dev->resource[0]->end = 16;
     p_dev->conf.Attributes = CONF_ENABLE_IRQ;
-    p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
     info->dev = dev;
     p_dev->priv = info;
index dfd32842412eba098ef858861322bbac523402aa..caf2b2ef4e358d6ac5e0074fb82a5fb9e6c1a178 100644 (file)
@@ -253,7 +253,6 @@ static int fmvj18x_probe(struct pcmcia_device *link)
 
     /* General socket configuration */
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
 
     dev->netdev_ops = &fjn_netdev_ops;
     dev->watchdog_timeo = TX_TIMEOUT;
index dbdea7f5e423204126377dac3b585ed4857adf5c..1327f086d86be619e050a9edcbf791c910083616 100644 (file)
@@ -153,7 +153,6 @@ static int __devinit ibmtr_attach(struct pcmcia_device *link)
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
     link->resource[0]->end = 4;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.Present = PRESENT_OPTION;
 
     info->dev = dev;
index 68f2deeb3ade11722dc5333386f4afd56cc98eb3..90d172804bfc45095a7d10f3845d12cc1ff6d112 100644 (file)
@@ -461,7 +461,6 @@ static int nmclan_probe(struct pcmcia_device *link)
     link->resource[0]->end = 32;
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.ConfigIndex = 1;
     link->conf.Present = PRESENT_OPTION;
 
index f3d7a149070aef68deff5bbdedd228e8d7cb1403..69135761719ae8ef5a928aca92e896622bafbc3b 100644 (file)
@@ -261,7 +261,6 @@ static int pcnet_probe(struct pcmcia_device *link)
     link->priv = dev;
 
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
 
     dev->netdev_ops = &pcnet_netdev_ops;
 
index 2031a27253d1a97985d31df3694e7853bfc4929a..2c2a8788c078186398f4cc9b564509000f84eac7 100644 (file)
@@ -327,7 +327,6 @@ static int smc91c92_probe(struct pcmcia_device *link)
     link->resource[0]->end = 16;
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
 
     /* The SMC91c92-specific entries in the device structure. */
     dev->netdev_ops = &smc_netdev_ops;
index 59398a6f134419ac7f9dbf26a1d9394ae9c93f5e..1776f49e091746f5f5a6944e1a6f4775a4d94dc1 100644 (file)
@@ -530,7 +530,6 @@ xirc2ps_probe(struct pcmcia_device *link)
 
     /* General socket configuration */
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.ConfigIndex = 1;
 
     /* Fill in card specific entries */
index ab60f1084716b7755700327cee6ee87ce83fe41b..ccb2fdde002cb67edfc035d803cee0d1d261d00d 100644 (file)
@@ -104,7 +104,6 @@ static int airo_probe(struct pcmcia_device *p_dev)
          device, and can be hard-wired here.
        */
        p_dev->conf.Attributes = 0;
-       p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
        /* Allocate space for private device-specific data */
        local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
index d6d585cb992ac4397133d7c5da3056ced192161a..8b75158caed7ff49c54ae0958bb91bf5e26b06ba 100644 (file)
@@ -114,7 +114,6 @@ static int atmel_probe(struct pcmcia_device *p_dev)
          device, and can be hard-wired here.
        */
        p_dev->conf.Attributes = 0;
-       p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
        /* Allocate space for private device-specific data */
        local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
index 618d9b5c1054f225c30a23d9a963e0a51a556b3d..138b26fcc75cc62ee40050865d62ee11002bb834 100644 (file)
@@ -73,7 +73,6 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
        err = -ENODEV;
 
        dev->conf.Attributes = CONF_ENABLE_IRQ;
-       dev->conf.IntType = INT_MEMORY_AND_IO;
 
        dev->resource[2]->flags |=  WIN_ENABLE | WIN_DATA_WIDTH_16 |
                         WIN_USE_WAIT;
index 3fa285b1bdd3bde141fd9901d0f90e49e6119a58..0fe6f82cda586f0f77f8ca676157d795f62bf627 100644 (file)
@@ -437,7 +437,6 @@ static int hostap_cs_probe(struct pcmcia_device *p_dev)
        int ret;
 
        PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info);
-       p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
        ret = prism2_config(p_dev);
        if (ret) {
index 9c298396be50b7fe5d0d6f8c6b102ecef441b3f7..814b7faaa365dfb719c1dcd47511945d97518cd9 100644 (file)
@@ -836,7 +836,6 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
        p_dev->priv = card;
 
        p_dev->conf.Attributes = 0;
-       p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
        if (pcmcia_loop_config(p_dev, if_cs_ioprobe, NULL)) {
                lbs_pr_err("error in pcmcia_loop_config\n");
index f7e3fa6305b48176144a2c5a6abb9839ab86fc9a..1147d6bd4733f29565047806f53497142b098fd1 100644 (file)
@@ -123,7 +123,6 @@ orinoco_cs_probe(struct pcmcia_device *link)
         * number, sizes, and attributes of IO windows) are fixed by
         * the nature of the device, and can be hard-wired here. */
        link->conf.Attributes = 0;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        return orinoco_cs_config(link);
 }                              /* orinoco_cs_attach */
index 1bbad101b559f3039e1b25a77743527ce0e79cfe..20b08ab8765505149b20b3370834728f7546d2a3 100644 (file)
@@ -185,7 +185,6 @@ spectrum_cs_probe(struct pcmcia_device *link)
         * number, sizes, and attributes of IO windows) are fixed by
         * the nature of the device, and can be hard-wired here. */
        link->conf.Attributes = 0;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        return spectrum_cs_config(link);
 }                              /* spectrum_cs_attach */
index ab34cb8c56c7aeb055bdf38f92adb6eace6aeaad..30cfd8890e345d78934c9595a5652b7d07f9112f 100644 (file)
@@ -319,7 +319,6 @@ static int ray_probe(struct pcmcia_device *p_dev)
 
        /* General socket configuration */
        p_dev->conf.Attributes = CONF_ENABLE_IRQ;
-       p_dev->conf.IntType = INT_MEMORY_AND_IO;
        p_dev->conf.ConfigIndex = 1;
 
        p_dev->priv = dev;
index a1cc2d498a1c01bd19b0174d1497d8bd0c0c8a8b..92a9ad575cc71970c7353c80a90fd73d8b8a9a68 100644 (file)
@@ -1889,7 +1889,6 @@ static int wl3501_probe(struct pcmcia_device *p_dev)
 
        /* General socket configuration */
        p_dev->conf.Attributes  = CONF_ENABLE_IRQ;
-       p_dev->conf.IntType     = INT_MEMORY_AND_IO;
        p_dev->conf.ConfigIndex = 1;
 
        dev = alloc_etherdev(sizeof(struct wl3501_card));
index 23e50f4a27c5b8719ac745223b2455d39bea0ad6..afd946e15ee7a36e17e059b3ce71a93c73cf08ce 100644 (file)
@@ -104,7 +104,6 @@ static int parport_probe(struct pcmcia_device *link)
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
     link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
 
     return parport_config(link);
 } /* parport_attach */
index 7ef464d40e91607d72e009bb22185587f8a4ab41..a0c5adb37b5fc3d68e67f7e5465d2bbaade140e1 100644 (file)
@@ -34,7 +34,6 @@ typedef struct config_t {
        struct kref     ref;
        unsigned int    state;
        unsigned int    Attributes;
-       unsigned int    IntType;
        unsigned int    ConfigBase;
        unsigned char   Option;
        unsigned int    CardValues;
index 8834bb415d38d8851db7e480ba1b331b1eb26ece..6210e1c2b432426877966348e709278163b6a3ab 100644 (file)
@@ -447,11 +447,6 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
        if (!(s->state & SOCKET_PRESENT))
                return -ENODEV;
 
-       if (req->IntType & INT_CARDBUS) {
-               dev_dbg(&p_dev->dev, "IntType may not be INT_CARDBUS\n");
-               return -EINVAL;
-       }
-
        mutex_lock(&s->ops_mutex);
        c = p_dev->function_config;
        if (c->state & CONFIG_LOCKED) {
@@ -470,12 +465,9 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
        }
 
        /* Pick memory or I/O card, DMA mode, interrupt */
-       c->IntType = req->IntType;
        c->Attributes = req->Attributes;
-       if (req->IntType & INT_MEMORY_AND_IO)
+       if (p_dev->_io)
                s->socket.flags |= SS_IOCARD;
-       if (req->IntType & INT_ZOOMED_VIDEO)
-               s->socket.flags |= SS_ZVCARD | SS_IOCARD;
        if (req->Attributes & CONF_ENABLE_DMA)
                s->socket.flags |= SS_DMA_MODE;
        if (req->Attributes & CONF_ENABLE_SPKR) {
index 61f49bdcc0c2815cc3b28f805c711cc3e4163ff8..3c0046e89f37feaebdfc71dfd755c746f0d0a34d 100644 (file)
@@ -103,7 +103,6 @@ static int aha152x_probe(struct pcmcia_device *link)
     link->resource[0]->end = 0x20;
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
     link->conf.Attributes = CONF_ENABLE_IRQ;
-    link->conf.IntType = INT_MEMORY_AND_IO;
     link->conf.Present = PRESENT_OPTION;
 
     return aha152x_config_cs(link);
index 13dbe5c48492e720c2691e24ad17930d3ee41f36..8ff760380d88e4537a8115b10f2d2f4aaed4b8a5 100644 (file)
@@ -86,7 +86,6 @@ static int fdomain_probe(struct pcmcia_device *link)
        link->resource[0]->end = 0x10;
        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
        link->conf.Attributes = CONF_ENABLE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
        link->conf.Present = PRESENT_OPTION;
 
        return fdomain_config(link);
index b90cade36746dcf4367796673af1338746725e00..c0cf2dfd6fbc7e23e00b46487d0cc025af951744 100644 (file)
@@ -1563,7 +1563,6 @@ static int nsp_cs_probe(struct pcmcia_device *link)
 
        /* General socket configuration */
        link->conf.Attributes    = CONF_ENABLE_IRQ;
-       link->conf.IntType       = INT_MEMORY_AND_IO;
 
        ret = nsp_cs_config(link);
 
index eb775f1a523cef364b0666db7baa01609a9d833d..77f46a279d6b3c1e806e96f5da390872fad56645 100644 (file)
@@ -159,7 +159,6 @@ static int qlogic_probe(struct pcmcia_device *link)
        link->resource[0]->end = 16;
        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
        link->conf.Attributes = CONF_ENABLE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
        link->conf.Present = PRESENT_OPTION;
 
        return qlogic_config(link);
index 321e390c9120631f07b81434e2dfe853bf78f05c..9aaf974d4d1c836fb30b927475cc2292f7a6cf59 100644 (file)
@@ -862,7 +862,6 @@ SYM53C500_probe(struct pcmcia_device *link)
        link->resource[0]->end = 16;
        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
        link->conf.Attributes = CONF_ENABLE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        return SYM53C500_config(link);
 } /* SYM53C500_attach */
index 0460c0882b70e3fd6816891705269ae4bbef140a..38baede2a770e38dace53ecf1450447e7c8880d6 100644 (file)
@@ -337,8 +337,6 @@ static int serial_probe(struct pcmcia_device *link)
        if (do_sound)
                link->conf.Attributes |= CONF_ENABLE_SPKR;
 
-       link->conf.IntType = INT_MEMORY_AND_IO;
-
        return serial_config(link);
 }
 
index f8ede1182ccc5113b657a997b3df20460bf729fa..11271b61f653207f5926d39029fb17cf4af3ccce 100644 (file)
@@ -694,7 +694,6 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link)
 
        /* Initialize the pcmcia_device structure */
        link->conf.Attributes = 0;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        cur_dev = link;
 
index 48d9fb1227df0d9d9d79c2848cc8615a6c52b837..319aad48ec2ea0540e668730bf8bba9e642d7229 100644 (file)
@@ -170,7 +170,6 @@ static int das08_pcmcia_attach(struct pcmcia_device *link)
           device, and can be hard-wired here.
         */
        link->conf.Attributes = 0;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        cur_dev = link;
 
index 8cf56cb0a3ff7c856f387d0910968afe52c4df9a..d269bbdf5cfbcb7dee353ae1246c8871178d0e9a 100644 (file)
@@ -499,7 +499,6 @@ static int dio700_cs_attach(struct pcmcia_device *link)
           device, and can be hard-wired here.
         */
        link->conf.Attributes = 0;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        pcmcia_cur_dev = link;
 
index ba693435963e5173479f076549d3f9fbe8f6a954..fcaa82967b926bfc03a132058161098af645198d 100644 (file)
@@ -251,7 +251,6 @@ static int dio24_cs_attach(struct pcmcia_device *link)
           device, and can be hard-wired here.
         */
        link->conf.Attributes = 0;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        pcmcia_cur_dev = link;
 
index 5d5f11f2b5c39c917ad4c206cb3f9b8777635607..a936c11e7dc99f7cb8a11f2490f9909b797aa764 100644 (file)
@@ -227,7 +227,6 @@ static int labpc_cs_attach(struct pcmcia_device *link)
           device, and can be hard-wired here.
         */
        link->conf.Attributes = 0;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        pcmcia_cur_dev = link;
 
index 1f2426352eb57d82cc0c18ba98d738d224fe31cf..be7e021e576d983041154fce59ddf8b7cc67084c 100644 (file)
@@ -266,7 +266,6 @@ static int cs_attach(struct pcmcia_device *link)
        link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
        link->resource[0]->end = 16;
        link->conf.Attributes = CONF_ENABLE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        cur_dev = link;
 
index bf489d7f49909ce75bc9e9b2c3990b1b840218f6..cd818fbd91857e4efc0869870c69e90b3adc8d76 100644 (file)
@@ -1039,7 +1039,6 @@ static int daqp_cs_attach(struct pcmcia_device *link)
           device, and can be hard-wired here.
         */
        link->conf.Attributes = 0;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        daqp_cs_config(link);
 
index 19c335458653fc1a293c2533017a5d426cdf4805..b2efff692ad54bbe40c2aa6ed8a96899cee6f2be 100644 (file)
@@ -148,7 +148,6 @@ static int wl_adapter_attach(struct pcmcia_device *link)
        link->resource[0]->end  = HCF_NUM_IO_PORTS;
        link->resource[0]->flags= IO_DATA_PATH_WIDTH_16;
        link->conf.Attributes   = CONF_ENABLE_IRQ;
-       link->conf.IntType      = INT_MEMORY_AND_IO;
        link->conf.ConfigIndex  = 5;
        link->conf.Present      = PRESENT_OPTION;
 
index a1900e5025184521e0fe1c6f0c39b233e43026fe..5ccc6d0560a97b905605cd43653e57250fd7376e 100644 (file)
@@ -34,7 +34,6 @@ static int ixj_probe(struct pcmcia_device *p_dev)
        /* 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->conf.IntType = INT_MEMORY_AND_IO;
        p_dev->priv = kzalloc(sizeof(struct ixj_info_t), GFP_KERNEL);
        if (!p_dev->priv) {
                return -ENOMEM;
index 8e8475298baae9a2bf6eab6dcb57b95c4f8cf70a..78bad51881442ce20fdf97e16028c1a769b6e6cb 100644 (file)
@@ -228,7 +228,6 @@ static int sl811_cs_probe(struct pcmcia_device *link)
        link->priv = local;
 
        link->conf.Attributes = 0;
-       link->conf.IntType = INT_MEMORY_AND_IO;
 
        return sl811_cs_config(link);
 }
index 29d693f72ba95f3b279303ed2065f27ea537a1c0..674edbc9ebef36f479bbf0a96414d2762538e3bc 100644 (file)
@@ -22,7 +22,6 @@
 /* For RequestConfiguration */
 typedef struct config_req_t {
     u_int      Attributes;
-    u_int      IntType;
     u_int      ConfigBase;
     u_char     ConfigIndex;
     u_int      Present;
@@ -36,12 +35,6 @@ typedef struct config_req_t {
 #define CONF_ENABLE_ESR                0x10
 #define CONF_VALID_CLIENT      0x100
 
-/* IntType field */
-#define INT_MEMORY             0x01
-#define INT_MEMORY_AND_IO      0x02
-#define INT_CARDBUS            0x04
-#define INT_ZOOMED_VIDEO       0x08
-
 /* Configuration registers present */
 #define PRESENT_OPTION         0x001
 #define PRESENT_STATUS         0x002
index 7ab9174a8a841b4a924474deb3c238a003180188..2e1282de77d465c28c4c114c44d3ae86d4b61a8f 100644 (file)
@@ -143,7 +143,6 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
        link->resource[0]->end = 16;
 
        link->conf.Attributes = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
        link->conf.ConfigIndex = 1;
        link->conf.Present = PRESENT_OPTION;
 
index a6edfc3be29a59b018d6b268f9a01255b08451db..a48b3ee713770c0a035545b699264cc7cfc30668 100644 (file)
@@ -163,7 +163,6 @@ static int snd_vxpocket_new(struct snd_card *card, int ibl,
        link->resource[0]->end = 16;
 
        link->conf.Attributes = CONF_ENABLE_IRQ;
-       link->conf.IntType = INT_MEMORY_AND_IO;
        link->conf.ConfigIndex = 1;
        link->conf.Present = PRESENT_OPTION;