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 /sound/pcmcia | |
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 'sound/pcmcia')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 4 | ||||
-rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 31f4bdc46ce6..7c4091a57b69 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
@@ -230,7 +230,6 @@ static void pdacf_config(dev_link_t *link) | |||
230 | struct snd_pdacf *pdacf = link->priv; | 230 | struct snd_pdacf *pdacf = link->priv; |
231 | tuple_t tuple; | 231 | tuple_t tuple; |
232 | cisparse_t *parse = NULL; | 232 | cisparse_t *parse = NULL; |
233 | config_info_t conf; | ||
234 | u_short buf[32]; | 233 | u_short buf[32]; |
235 | int last_fn, last_ret; | 234 | int last_fn, last_ret; |
236 | 235 | ||
@@ -253,9 +252,6 @@ static void pdacf_config(dev_link_t *link) | |||
253 | link->conf.ConfigIndex = 0x5; | 252 | link->conf.ConfigIndex = 0x5; |
254 | kfree(parse); | 253 | kfree(parse); |
255 | 254 | ||
256 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf)); | ||
257 | link->conf.Vcc = conf.Vcc; | ||
258 | |||
259 | /* Configure card */ | 255 | /* Configure card */ |
260 | link->state |= DEV_CONFIG; | 256 | link->state |= DEV_CONFIG; |
261 | 257 | ||
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index e101e05afac3..ff2f927559fc 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c | |||
@@ -161,7 +161,6 @@ static struct snd_vxpocket *snd_vxpocket_new(struct snd_card *card, int ibl) | |||
161 | link->irq.Instance = chip; | 161 | link->irq.Instance = chip; |
162 | 162 | ||
163 | link->conf.Attributes = CONF_ENABLE_IRQ; | 163 | link->conf.Attributes = CONF_ENABLE_IRQ; |
164 | link->conf.Vcc = 50; | ||
165 | link->conf.IntType = INT_MEMORY_AND_IO; | 164 | link->conf.IntType = INT_MEMORY_AND_IO; |
166 | link->conf.ConfigIndex = 1; | 165 | link->conf.ConfigIndex = 1; |
167 | link->conf.Present = PRESENT_OPTION; | 166 | link->conf.Present = PRESENT_OPTION; |