diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-29 10:33:23 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-09-29 11:20:22 -0400 |
commit | 37979e1546a790c44adbc7f27a85569944480ebc (patch) | |
tree | 18499b4d2890409c1cbe49cc1af97b57f4a2c906 /drivers/char/pcmcia/synclink_cs.c | |
parent | fc301101034c06bf56a7f71bf682c48909e401a4 (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/synclink_cs.c')
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 9ecd6bef5d3b..ba7ccf5701ed 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -551,7 +551,6 @@ static int mgslpc_probe(struct pcmcia_device *link) | |||
551 | /* Initialize the struct pcmcia_device structure */ | 551 | /* Initialize the struct pcmcia_device structure */ |
552 | 552 | ||
553 | link->conf.Attributes = 0; | 553 | link->conf.Attributes = 0; |
554 | link->conf.IntType = INT_MEMORY_AND_IO; | ||
555 | 554 | ||
556 | ret = mgslpc_config(link); | 555 | ret = mgslpc_config(link); |
557 | if (ret) | 556 | if (ret) |
@@ -595,7 +594,6 @@ static int mgslpc_config(struct pcmcia_device *link) | |||
595 | goto failed; | 594 | goto failed; |
596 | 595 | ||
597 | link->conf.Attributes = CONF_ENABLE_IRQ; | 596 | link->conf.Attributes = CONF_ENABLE_IRQ; |
598 | link->conf.IntType = INT_MEMORY_AND_IO; | ||
599 | link->conf.ConfigIndex = 8; | 597 | link->conf.ConfigIndex = 8; |
600 | link->conf.Present = PRESENT_OPTION; | 598 | link->conf.Present = PRESENT_OPTION; |
601 | 599 | ||