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/char/pcmcia | |
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/char/pcmcia')
-rw-r--r-- | drivers/char/pcmcia/cm4000_cs.c | 2 | ||||
-rw-r--r-- | drivers/char/pcmcia/cm4040_cs.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 47adec480bd1..7eafd2f4dbb9 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
@@ -1763,8 +1763,6 @@ static int cm4000_config_check(struct pcmcia_device *p_dev, | |||
1763 | cistpl_cftable_entry_t *cfg, | 1763 | cistpl_cftable_entry_t *cfg, |
1764 | void *priv_data) | 1764 | void *priv_data) |
1765 | { | 1765 | { |
1766 | p_dev->conf.ConfigIndex = cfg->index; | ||
1767 | |||
1768 | if (!cfg->io.nwin) | 1766 | if (!cfg->io.nwin) |
1769 | return -ENODEV; | 1767 | return -ENODEV; |
1770 | 1768 | ||
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c index e0f5d8c9b266..71ca8c474c89 100644 --- a/drivers/char/pcmcia/cm4040_cs.c +++ b/drivers/char/pcmcia/cm4040_cs.c | |||
@@ -531,8 +531,6 @@ static int cm4040_config_check(struct pcmcia_device *p_dev, | |||
531 | void *priv_data) | 531 | void *priv_data) |
532 | { | 532 | { |
533 | int rc; | 533 | int rc; |
534 | p_dev->conf.ConfigIndex = cfg->index; | ||
535 | |||
536 | if (!cfg->io.nwin) | 534 | if (!cfg->io.nwin) |
537 | return -ENODEV; | 535 | return -ENODEV; |
538 | 536 | ||