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/telephony/ixj_pcmcia.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/telephony/ixj_pcmcia.c')
-rw-r--r-- | drivers/telephony/ixj_pcmcia.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c index 509465586ded..de794b21d7ff 100644 --- a/drivers/telephony/ixj_pcmcia.c +++ b/drivers/telephony/ixj_pcmcia.c | |||
@@ -51,7 +51,6 @@ static int ixj_attach(struct pcmcia_device *p_dev) | |||
51 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 51 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
52 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; | 52 | link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; |
53 | link->io.IOAddrLines = 3; | 53 | link->io.IOAddrLines = 3; |
54 | link->conf.Vcc = 50; | ||
55 | link->conf.IntType = INT_MEMORY_AND_IO; | 54 | link->conf.IntType = INT_MEMORY_AND_IO; |
56 | link->priv = kmalloc(sizeof(struct ixj_info_t), GFP_KERNEL); | 55 | link->priv = kmalloc(sizeof(struct ixj_info_t), GFP_KERNEL); |
57 | if (!link->priv) { | 56 | if (!link->priv) { |
@@ -157,7 +156,6 @@ static void ixj_config(dev_link_t * link) | |||
157 | tuple_t tuple; | 156 | tuple_t tuple; |
158 | u_short buf[128]; | 157 | u_short buf[128]; |
159 | cisparse_t parse; | 158 | cisparse_t parse; |
160 | config_info_t conf; | ||
161 | cistpl_cftable_entry_t *cfg = &parse.cftable_entry; | 159 | cistpl_cftable_entry_t *cfg = &parse.cftable_entry; |
162 | cistpl_cftable_entry_t dflt = | 160 | cistpl_cftable_entry_t dflt = |
163 | { | 161 | { |
@@ -178,7 +176,6 @@ static void ixj_config(dev_link_t * link) | |||
178 | link->conf.ConfigBase = parse.config.base; | 176 | link->conf.ConfigBase = parse.config.base; |
179 | link->conf.Present = parse.config.rmask[0]; | 177 | link->conf.Present = parse.config.rmask[0]; |
180 | link->state |= DEV_CONFIG; | 178 | link->state |= DEV_CONFIG; |
181 | CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf)); | ||
182 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | 179 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; |
183 | tuple.Attributes = 0; | 180 | tuple.Attributes = 0; |
184 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple)); | 181 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple)); |