aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/pcmcia/cm4040_cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-01-15 06:43:16 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 10:15:55 -0500
commit70294b468302fd7a0a99dad935c7ba5322989345 (patch)
treee54b0b7c85517ef717f3755e06ca08fbb0f5937e /drivers/char/pcmcia/cm4040_cs.c
parent4bbed5231468014b500b048d7370a1c6c349231a (diff)
[PATCH] pcmcia: remove unneeded Vcc pseudo setting
As we do not allow setting Vcc in the pcmcia core, and Vpp1 and Vpp2 can only be set to the same value, a lot of code can be streamlined. 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.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 47f10c8b8886..94ecd0342b72 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -520,7 +520,6 @@ static void reader_config(dev_link_t *link, int devno)
520 struct reader_dev *dev; 520 struct reader_dev *dev;
521 tuple_t tuple; 521 tuple_t tuple;
522 cisparse_t parse; 522 cisparse_t parse;
523 config_info_t conf;
524 u_char buf[64]; 523 u_char buf[64];
525 int fail_fn, fail_rc; 524 int fail_fn, fail_rc;
526 int rc; 525 int rc;
@@ -546,16 +545,10 @@ static void reader_config(dev_link_t *link, int devno)
546 fail_fn = ParseTuple; 545 fail_fn = ParseTuple;
547 goto cs_failed; 546 goto cs_failed;
548 } 547 }
549 if ((fail_rc = pcmcia_get_configuration_info(handle, &conf))
550 != CS_SUCCESS) {
551 fail_fn = GetConfigurationInfo;
552 goto cs_failed;
553 }
554 548
555 link->state |= DEV_CONFIG; 549 link->state |= DEV_CONFIG;
556 link->conf.ConfigBase = parse.config.base; 550 link->conf.ConfigBase = parse.config.base;
557 link->conf.Present = parse.config.rmask[0]; 551 link->conf.Present = parse.config.rmask[0];
558 link->conf.Vcc = conf.Vcc;
559 552
560 link->io.BasePort2 = 0; 553 link->io.BasePort2 = 0;
561 link->io.NumPorts2 = 0; 554 link->io.NumPorts2 = 0;