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/net/pcmcia/pcnet_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/net/pcmcia/pcnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 3a2b731eeb3c..5a7e58af0b3b 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
@@ -531,7 +531,6 @@ static void pcnet_config(dev_link_t *link) | |||
531 | int i, last_ret, last_fn, start_pg, stop_pg, cm_offset; | 531 | int i, last_ret, last_fn, start_pg, stop_pg, cm_offset; |
532 | int manfid = 0, prodid = 0, has_shmem = 0; | 532 | int manfid = 0, prodid = 0, has_shmem = 0; |
533 | u_short buf[64]; | 533 | u_short buf[64]; |
534 | config_info_t conf; | ||
535 | hw_info_t *hw_info; | 534 | hw_info_t *hw_info; |
536 | 535 | ||
537 | DEBUG(0, "pcnet_config(0x%p)\n", link); | 536 | DEBUG(0, "pcnet_config(0x%p)\n", link); |
@@ -550,10 +549,6 @@ static void pcnet_config(dev_link_t *link) | |||
550 | /* Configure card */ | 549 | /* Configure card */ |
551 | link->state |= DEV_CONFIG; | 550 | link->state |= DEV_CONFIG; |
552 | 551 | ||
553 | /* Look up current Vcc */ | ||
554 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf)); | ||
555 | link->conf.Vcc = conf.Vcc; | ||
556 | |||
557 | tuple.DesiredTuple = CISTPL_MANFID; | 552 | tuple.DesiredTuple = CISTPL_MANFID; |
558 | tuple.Attributes = TUPLE_RETURN_COMMON; | 553 | tuple.Attributes = TUPLE_RETURN_COMMON; |
559 | if ((pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) && | 554 | if ((pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) && |