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/wireless/orinoco_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/wireless/orinoco_cs.c')
-rw-r--r-- | drivers/net/wireless/orinoco_cs.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c index 89e16cd1be8c..75981d88a1e2 100644 --- a/drivers/net/wireless/orinoco_cs.c +++ b/drivers/net/wireless/orinoco_cs.c | |||
@@ -218,8 +218,7 @@ orinoco_cs_config(dev_link_t *link) | |||
218 | 218 | ||
219 | /* Look up the current Vcc */ | 219 | /* Look up the current Vcc */ |
220 | CS_CHECK(GetConfigurationInfo, | 220 | CS_CHECK(GetConfigurationInfo, |
221 | pcmcia_get_configuration_info(handle, &conf)); | 221 | pcmcia_get_configuration_info(link->handle, &conf)); |
222 | link->conf.Vcc = conf.Vcc; | ||
223 | 222 | ||
224 | /* | 223 | /* |
225 | * In this loop, we scan the CIS for configuration table | 224 | * In this loop, we scan the CIS for configuration table |
@@ -274,10 +273,10 @@ orinoco_cs_config(dev_link_t *link) | |||
274 | } | 273 | } |
275 | 274 | ||
276 | if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM)) | 275 | if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM)) |
277 | link->conf.Vpp1 = link->conf.Vpp2 = | 276 | link->conf.Vpp = |
278 | cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000; | 277 | cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000; |
279 | else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM)) | 278 | else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM)) |
280 | link->conf.Vpp1 = link->conf.Vpp2 = | 279 | link->conf.Vpp = |
281 | dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000; | 280 | dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000; |
282 | 281 | ||
283 | /* Do we need to allocate an interrupt? */ | 282 | /* Do we need to allocate an interrupt? */ |
@@ -373,12 +372,11 @@ orinoco_cs_config(dev_link_t *link) | |||
373 | link->state &= ~DEV_CONFIG_PENDING; | 372 | link->state &= ~DEV_CONFIG_PENDING; |
374 | 373 | ||
375 | /* Finally, report what we've done */ | 374 | /* Finally, report what we've done */ |
376 | printk(KERN_DEBUG "%s: index 0x%02x: Vcc %d.%d", | 375 | printk(KERN_DEBUG "%s: index 0x%02x: ", |
377 | dev->name, link->conf.ConfigIndex, | 376 | dev->name, link->conf.ConfigIndex); |
378 | link->conf.Vcc / 10, link->conf.Vcc % 10); | 377 | if (link->conf.Vpp) |
379 | if (link->conf.Vpp1) | 378 | printk(", Vpp %d.%d", link->conf.Vpp / 10, |
380 | printk(", Vpp %d.%d", link->conf.Vpp1 / 10, | 379 | link->conf.Vpp % 10); |
381 | link->conf.Vpp1 % 10); | ||
382 | printk(", irq %d", link->irq.AssignedIRQ); | 380 | printk(", irq %d", link->irq.AssignedIRQ); |
383 | if (link->io.NumPorts1) | 381 | if (link->io.NumPorts1) |
384 | printk(", io 0x%04x-0x%04x", link->io.BasePort1, | 382 | printk(", io 0x%04x-0x%04x", link->io.BasePort1, |