aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/pcmcia
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
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')
-rw-r--r--drivers/char/pcmcia/cm4000_cs.c7
-rw-r--r--drivers/char/pcmcia/cm4040_cs.c7
-rw-r--r--drivers/char/pcmcia/synclink_cs.c7
3 files changed, 0 insertions, 21 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 870decbdf7ca..c996ae1375be 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1765,7 +1765,6 @@ static void cm4000_config(dev_link_t * link, int devno)
1765 struct cm4000_dev *dev; 1765 struct cm4000_dev *dev;
1766 tuple_t tuple; 1766 tuple_t tuple;
1767 cisparse_t parse; 1767 cisparse_t parse;
1768 config_info_t conf;
1769 u_char buf[64]; 1768 u_char buf[64];
1770 int fail_fn, fail_rc; 1769 int fail_fn, fail_rc;
1771 int rc; 1770 int rc;
@@ -1790,16 +1789,10 @@ static void cm4000_config(dev_link_t * link, int devno)
1790 fail_fn = ParseTuple; 1789 fail_fn = ParseTuple;
1791 goto cs_failed; 1790 goto cs_failed;
1792 } 1791 }
1793 if ((fail_rc =
1794 pcmcia_get_configuration_info(handle, &conf)) != CS_SUCCESS) {
1795 fail_fn = GetConfigurationInfo;
1796 goto cs_failed;
1797 }
1798 1792
1799 link->state |= DEV_CONFIG; 1793 link->state |= DEV_CONFIG;
1800 link->conf.ConfigBase = parse.config.base; 1794 link->conf.ConfigBase = parse.config.base;
1801 link->conf.Present = parse.config.rmask[0]; 1795 link->conf.Present = parse.config.rmask[0];
1802 link->conf.Vcc = conf.Vcc;
1803 1796
1804 link->io.BasePort2 = 0; 1797 link->io.BasePort2 = 0;
1805 link->io.NumPorts2 = 0; 1798 link->io.NumPorts2 = 0;
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;
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index d3ea53a5a50f..a6cbd3239921 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -576,7 +576,6 @@ static int mgslpc_attach(struct pcmcia_device *p_dev)
576 link->irq.Handler = NULL; 576 link->irq.Handler = NULL;
577 577
578 link->conf.Attributes = 0; 578 link->conf.Attributes = 0;
579 link->conf.Vcc = 50;
580 link->conf.IntType = INT_MEMORY_AND_IO; 579 link->conf.IntType = INT_MEMORY_AND_IO;
581 580
582 link->handle = p_dev; 581 link->handle = p_dev;
@@ -604,7 +603,6 @@ static void mgslpc_config(dev_link_t *link)
604 cisparse_t parse; 603 cisparse_t parse;
605 int last_fn, last_ret; 604 int last_fn, last_ret;
606 u_char buf[64]; 605 u_char buf[64];
607 config_info_t conf;
608 cistpl_cftable_entry_t dflt = { 0 }; 606 cistpl_cftable_entry_t dflt = { 0 };
609 cistpl_cftable_entry_t *cfg; 607 cistpl_cftable_entry_t *cfg;
610 608
@@ -626,10 +624,6 @@ static void mgslpc_config(dev_link_t *link)
626 /* Configure card */ 624 /* Configure card */
627 link->state |= DEV_CONFIG; 625 link->state |= DEV_CONFIG;
628 626
629 /* Look up the current Vcc */
630 CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
631 link->conf.Vcc = conf.Vcc;
632
633 /* get CIS configuration entry */ 627 /* get CIS configuration entry */
634 628
635 tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; 629 tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
@@ -662,7 +656,6 @@ static void mgslpc_config(dev_link_t *link)
662 } 656 }
663 657
664 link->conf.Attributes = CONF_ENABLE_IRQ; 658 link->conf.Attributes = CONF_ENABLE_IRQ;
665 link->conf.Vcc = 50;
666 link->conf.IntType = INT_MEMORY_AND_IO; 659 link->conf.IntType = INT_MEMORY_AND_IO;
667 link->conf.ConfigIndex = 8; 660 link->conf.ConfigIndex = 8;
668 link->conf.Present = PRESENT_OPTION; 661 link->conf.Present = PRESENT_OPTION;