diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-02 08:59:13 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-22 19:21:29 -0400 |
commit | 498ac1899b62626bf6879a251d75c22ec564c559 (patch) | |
tree | d17c6c02ac97db98ac343a7ca1190147047385b2 /drivers/isdn/hisax/teles_cs.c | |
parent | 84e2d34004dcd0c90d1af43a143511b334f11a4d (diff) |
pcmcia: pcmcia_config_loop() ConfigIndex unification
Almost all drivers set p_dev->conf.ConfigIndex to cfg->index in
the pcmcia_config_loop() callback function. Therefore, factor it out.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/isdn/hisax/teles_cs.c')
-rw-r--r-- | drivers/isdn/hisax/teles_cs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c index 2b063a2916f4..ecb75ae8a399 100644 --- a/drivers/isdn/hisax/teles_cs.c +++ b/drivers/isdn/hisax/teles_cs.c | |||
@@ -202,13 +202,11 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev, | |||
202 | 202 | ||
203 | if ((cf->io.nwin > 0) && cf->io.win[0].base) { | 203 | if ((cf->io.nwin > 0) && cf->io.win[0].base) { |
204 | printk(KERN_INFO "(teles_cs: looks like the 96 model)\n"); | 204 | printk(KERN_INFO "(teles_cs: looks like the 96 model)\n"); |
205 | p_dev->conf.ConfigIndex = cf->index; | ||
206 | p_dev->io.BasePort1 = cf->io.win[0].base; | 205 | p_dev->io.BasePort1 = cf->io.win[0].base; |
207 | if (!pcmcia_request_io(p_dev, &p_dev->io)) | 206 | if (!pcmcia_request_io(p_dev, &p_dev->io)) |
208 | return 0; | 207 | return 0; |
209 | } else { | 208 | } else { |
210 | printk(KERN_INFO "(teles_cs: looks like the 97 model)\n"); | 209 | printk(KERN_INFO "(teles_cs: looks like the 97 model)\n"); |
211 | p_dev->conf.ConfigIndex = cf->index; | ||
212 | for (j = 0x2f0; j > 0x100; j -= 0x10) { | 210 | for (j = 0x2f0; j > 0x100; j -= 0x10) { |
213 | p_dev->io.BasePort1 = j; | 211 | p_dev->io.BasePort1 = j; |
214 | if (!pcmcia_request_io(p_dev, &p_dev->io)) | 212 | if (!pcmcia_request_io(p_dev, &p_dev->io)) |