diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-15 06:43:16 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 10:15:55 -0500 |
commit | 70294b468302fd7a0a99dad935c7ba5322989345 (patch) | |
tree | e54b0b7c85517ef717f3755e06ca08fbb0f5937e /drivers/char/pcmcia/synclink_cs.c | |
parent | 4bbed5231468014b500b048d7370a1c6c349231a (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/synclink_cs.c')
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 7 |
1 files changed, 0 insertions, 7 deletions
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; |