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/parport | |
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/parport')
-rw-r--r-- | drivers/parport/parport_cs.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index 5e12ed2f1b6e..8d60146c7213 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
@@ -117,7 +117,6 @@ static int parport_attach(struct pcmcia_device *p_dev) | |||
117 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; | 117 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
118 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | 118 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; |
119 | link->conf.Attributes = CONF_ENABLE_IRQ; | 119 | link->conf.Attributes = CONF_ENABLE_IRQ; |
120 | link->conf.Vcc = 50; | ||
121 | link->conf.IntType = INT_MEMORY_AND_IO; | 120 | link->conf.IntType = INT_MEMORY_AND_IO; |
122 | 121 | ||
123 | link->handle = p_dev; | 122 | link->handle = p_dev; |
@@ -168,7 +167,6 @@ void parport_config(dev_link_t *link) | |||
168 | tuple_t tuple; | 167 | tuple_t tuple; |
169 | u_short buf[128]; | 168 | u_short buf[128]; |
170 | cisparse_t parse; | 169 | cisparse_t parse; |
171 | config_info_t conf; | ||
172 | cistpl_cftable_entry_t *cfg = &parse.cftable_entry; | 170 | cistpl_cftable_entry_t *cfg = &parse.cftable_entry; |
173 | cistpl_cftable_entry_t dflt = { 0 }; | 171 | cistpl_cftable_entry_t dflt = { 0 }; |
174 | struct parport *p; | 172 | struct parport *p; |
@@ -189,9 +187,6 @@ void parport_config(dev_link_t *link) | |||
189 | /* Configure card */ | 187 | /* Configure card */ |
190 | link->state |= DEV_CONFIG; | 188 | link->state |= DEV_CONFIG; |
191 | 189 | ||
192 | /* Not sure if this is right... look up the current Vcc */ | ||
193 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf)); | ||
194 | |||
195 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | 190 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; |
196 | tuple.Attributes = 0; | 191 | tuple.Attributes = 0; |
197 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple)); | 192 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple)); |