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/elsa_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/elsa_cs.c')
-rw-r--r-- | drivers/isdn/hisax/elsa_cs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c index 449800898dcf..c9899e51a262 100644 --- a/drivers/isdn/hisax/elsa_cs.c +++ b/drivers/isdn/hisax/elsa_cs.c | |||
@@ -212,13 +212,11 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev, | |||
212 | 212 | ||
213 | if ((cf->io.nwin > 0) && cf->io.win[0].base) { | 213 | if ((cf->io.nwin > 0) && cf->io.win[0].base) { |
214 | printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n"); | 214 | printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n"); |
215 | p_dev->conf.ConfigIndex = cf->index; | ||
216 | p_dev->io.BasePort1 = cf->io.win[0].base; | 215 | p_dev->io.BasePort1 = cf->io.win[0].base; |
217 | if (!pcmcia_request_io(p_dev, &p_dev->io)) | 216 | if (!pcmcia_request_io(p_dev, &p_dev->io)) |
218 | return 0; | 217 | return 0; |
219 | } else { | 218 | } else { |
220 | printk(KERN_INFO "(elsa_cs: looks like the 97 model)\n"); | 219 | printk(KERN_INFO "(elsa_cs: looks like the 97 model)\n"); |
221 | p_dev->conf.ConfigIndex = cf->index; | ||
222 | for (j = 0x2f0; j > 0x100; j -= 0x10) { | 220 | for (j = 0x2f0; j > 0x100; j -= 0x10) { |
223 | p_dev->io.BasePort1 = j; | 221 | p_dev->io.BasePort1 = j; |
224 | if (!pcmcia_request_io(p_dev, &p_dev->io)) | 222 | if (!pcmcia_request_io(p_dev, &p_dev->io)) |