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/isdn/hisax/elsa_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/isdn/hisax/elsa_cs.c')
-rw-r--r-- | drivers/isdn/hisax/elsa_cs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c index b76b303ebf6b..00835d537c10 100644 --- a/drivers/isdn/hisax/elsa_cs.c +++ b/drivers/isdn/hisax/elsa_cs.c | |||
@@ -170,7 +170,6 @@ static int elsa_cs_attach(struct pcmcia_device *p_dev) | |||
170 | link->io.IOAddrLines = 3; | 170 | link->io.IOAddrLines = 3; |
171 | 171 | ||
172 | link->conf.Attributes = CONF_ENABLE_IRQ; | 172 | link->conf.Attributes = CONF_ENABLE_IRQ; |
173 | link->conf.Vcc = 50; | ||
174 | link->conf.IntType = INT_MEMORY_AND_IO; | 173 | link->conf.IntType = INT_MEMORY_AND_IO; |
175 | 174 | ||
176 | link->handle = p_dev; | 175 | link->handle = p_dev; |
@@ -324,11 +323,8 @@ static void elsa_cs_config(dev_link_t *link) | |||
324 | link->dev = &dev->node; | 323 | link->dev = &dev->node; |
325 | 324 | ||
326 | /* Finally, report what we've done */ | 325 | /* Finally, report what we've done */ |
327 | printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d", | 326 | printk(KERN_INFO "%s: index 0x%02x: ", |
328 | dev->node.dev_name, link->conf.ConfigIndex, | 327 | dev->node.dev_name, link->conf.ConfigIndex); |
329 | link->conf.Vcc/10, link->conf.Vcc%10); | ||
330 | if (link->conf.Vpp1) | ||
331 | printk(", Vpp %d.%d", link->conf.Vpp1/10, link->conf.Vpp1%10); | ||
332 | if (link->conf.Attributes & CONF_ENABLE_IRQ) | 328 | if (link->conf.Attributes & CONF_ENABLE_IRQ) |
333 | printk(", irq %d", link->irq.AssignedIRQ); | 329 | printk(", irq %d", link->irq.AssignedIRQ); |
334 | if (link->io.NumPorts1) | 330 | if (link->io.NumPorts1) |