aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/pcmcia/cm4040_cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-29 10:33:23 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-09-29 11:20:22 -0400
commit37979e1546a790c44adbc7f27a85569944480ebc (patch)
tree18499b4d2890409c1cbe49cc1af97b57f4a2c906 /drivers/char/pcmcia/cm4040_cs.c
parentfc301101034c06bf56a7f71bf682c48909e401a4 (diff)
pcmcia: simplify IntType
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>
Diffstat (limited to 'drivers/char/pcmcia/cm4040_cs.c')
-rw-r--r--drivers/char/pcmcia/cm4040_cs.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 815cde1d0570..a32eba0afdfc 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -547,8 +547,6 @@ static int reader_config(struct pcmcia_device *link, int devno)
547 if (pcmcia_loop_config(link, cm4040_config_check, NULL)) 547 if (pcmcia_loop_config(link, cm4040_config_check, NULL))
548 goto cs_release; 548 goto cs_release;
549 549
550 link->conf.IntType = 00000002;
551
552 fail_rc = pcmcia_request_configuration(link, &link->conf); 550 fail_rc = pcmcia_request_configuration(link, &link->conf);
553 if (fail_rc != 0) { 551 if (fail_rc != 0) {
554 dev_printk(KERN_INFO, &link->dev, 552 dev_printk(KERN_INFO, &link->dev,
@@ -599,7 +597,6 @@ static int reader_probe(struct pcmcia_device *link)
599 link->priv = dev; 597 link->priv = dev;
600 dev->p_dev = link; 598 dev->p_dev = link;
601 599
602 link->conf.IntType = INT_MEMORY_AND_IO;
603 dev_table[i] = link; 600 dev_table[i] = link;
604 601
605 init_waitqueue_head(&dev->devq); 602 init_waitqueue_head(&dev->devq);