aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-02 08:59:13 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-22 19:21:29 -0400
commit498ac1899b62626bf6879a251d75c22ec564c559 (patch)
treed17c6c02ac97db98ac343a7ca1190147047385b2 /drivers/scsi
parent84e2d34004dcd0c90d1af43a143511b334f11a4d (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/scsi')
-rw-r--r--drivers/scsi/pcmcia/aha152x_stub.c1
-rw-r--r--drivers/scsi/pcmcia/fdomain_stub.c1
-rw-r--r--drivers/scsi/pcmcia/nsp_cs.c2
-rw-r--r--drivers/scsi/pcmcia/qlogic_stub.c1
-rw-r--r--drivers/scsi/pcmcia/sym53c500_cs.c1
5 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index bbcc20f2d9d0..5e4d8e42ba0b 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -152,7 +152,6 @@ static int aha152x_config_check(struct pcmcia_device *p_dev,
152 p_dev->io.BasePort1 = cfg->io.win[1].base; 152 p_dev->io.BasePort1 = cfg->io.win[1].base;
153 if ((cfg->io.nwin > 0) && 153 if ((cfg->io.nwin > 0) &&
154 (p_dev->io.BasePort1 < 0xffff)) { 154 (p_dev->io.BasePort1 < 0xffff)) {
155 p_dev->conf.ConfigIndex = cfg->index;
156 if (!pcmcia_request_io(p_dev, &p_dev->io)) 155 if (!pcmcia_request_io(p_dev, &p_dev->io))
157 return 0; 156 return 0;
158 } 157 }
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index fefef7d81f14..e3d6937c9200 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -127,7 +127,6 @@ static int fdomain_config_check(struct pcmcia_device *p_dev,
127 cistpl_cftable_entry_t *cfg, 127 cistpl_cftable_entry_t *cfg,
128 void *priv_data) 128 void *priv_data)
129{ 129{
130 p_dev->conf.ConfigIndex = cfg->index;
131 p_dev->io.BasePort1 = cfg->io.win[0].base; 130 p_dev->io.BasePort1 = cfg->io.win[0].base;
132 return pcmcia_request_io(p_dev, &p_dev->io); 131 return pcmcia_request_io(p_dev, &p_dev->io);
133} 132}
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index a29a6f29c977..aee24b745dc9 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1626,8 +1626,6 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev,
1626 if (cfg->index == 0) 1626 if (cfg->index == 0)
1627 return -ENODEV; 1627 return -ENODEV;
1628 1628
1629 p_dev->conf.ConfigIndex = cfg->index;
1630
1631 /* Does this card need audio output? */ 1629 /* Does this card need audio output? */
1632 if (cfg->flags & CISTPL_CFTABLE_AUDIO) { 1630 if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
1633 p_dev->conf.Attributes |= CONF_ENABLE_SPKR; 1631 p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index aa9b9e0968b6..a361275b20a3 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -199,7 +199,6 @@ static int qlogic_config_check(struct pcmcia_device *p_dev,
199 cistpl_cftable_entry_t *cfg, 199 cistpl_cftable_entry_t *cfg,
200 void *priv_data) 200 void *priv_data)
201{ 201{
202 p_dev->conf.ConfigIndex = cfg->index;
203 p_dev->io.BasePort1 = cfg->io.win[0].base; 202 p_dev->io.BasePort1 = cfg->io.win[0].base;
204 p_dev->io.NumPorts1 = cfg->io.win[0].len; 203 p_dev->io.NumPorts1 = cfg->io.win[0].len;
205 204
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 15369d9e3121..23a5219051a9 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -704,7 +704,6 @@ static int SYM53C500_config_check(struct pcmcia_device *p_dev,
704 cistpl_cftable_entry_t *cfg, 704 cistpl_cftable_entry_t *cfg,
705 void *priv_data) 705 void *priv_data)
706{ 706{
707 p_dev->conf.ConfigIndex = cfg->index;
708 p_dev->io.BasePort1 = cfg->io.win[0].base; 707 p_dev->io.BasePort1 = cfg->io.win[0].base;
709 p_dev->io.NumPorts1 = cfg->io.win[0].len; 708 p_dev->io.NumPorts1 = cfg->io.win[0].len;
710 709