aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
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/usb
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/usb')
-rw-r--r--drivers/usb/host/sl811_cs.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index ca3fc336d3d7..c6f1baf541ab 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -191,7 +191,6 @@ static void sl811_cs_config(dev_link_t *link)
191 /* Look up the current Vcc */ 191 /* Look up the current Vcc */
192 CS_CHECK(GetConfigurationInfo, 192 CS_CHECK(GetConfigurationInfo,
193 pcmcia_get_configuration_info(handle, &conf)); 193 pcmcia_get_configuration_info(handle, &conf));
194 link->conf.Vcc = conf.Vcc;
195 194
196 tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; 195 tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
197 CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple)); 196 CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
@@ -225,10 +224,10 @@ static void sl811_cs_config(dev_link_t *link)
225 } 224 }
226 225
227 if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM)) 226 if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
228 link->conf.Vpp1 = link->conf.Vpp2 = 227 link->conf.Vpp =
229 cfg->vpp1.param[CISTPL_POWER_VNOM]/10000; 228 cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
230 else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM)) 229 else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
231 link->conf.Vpp1 = link->conf.Vpp2 = 230 link->conf.Vpp =
232 dflt.vpp1.param[CISTPL_POWER_VNOM]/10000; 231 dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
233 232
234 /* we need an interrupt */ 233 /* we need an interrupt */
@@ -271,11 +270,10 @@ next_entry:
271 dev->node.major = dev->node.minor = 0; 270 dev->node.major = dev->node.minor = 0;
272 link->dev = &dev->node; 271 link->dev = &dev->node;
273 272
274 printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d", 273 printk(KERN_INFO "%s: index 0x%02x: ",
275 dev->node.dev_name, link->conf.ConfigIndex, 274 dev->node.dev_name, link->conf.ConfigIndex);
276 link->conf.Vcc/10, link->conf.Vcc%10); 275 if (link->conf.Vpp)
277 if (link->conf.Vpp1) 276 printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10);
278 printk(", Vpp %d.%d", link->conf.Vpp1/10, link->conf.Vpp1%10);
279 printk(", irq %d", link->irq.AssignedIRQ); 277 printk(", irq %d", link->irq.AssignedIRQ);
280 printk(", io 0x%04x-0x%04x", link->io.BasePort1, 278 printk(", io 0x%04x-0x%04x", link->io.BasePort1,
281 link->io.BasePort1+link->io.NumPorts1-1); 279 link->io.BasePort1+link->io.NumPorts1-1);
@@ -311,7 +309,6 @@ static int sl811_cs_attach(struct pcmcia_device *p_dev)
311 link->irq.Handler = NULL; 309 link->irq.Handler = NULL;
312 310
313 link->conf.Attributes = 0; 311 link->conf.Attributes = 0;
314 link->conf.Vcc = 33;
315 link->conf.IntType = INT_MEMORY_AND_IO; 312 link->conf.IntType = INT_MEMORY_AND_IO;
316 313
317 link->handle = p_dev; 314 link->handle = p_dev;