diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-29 12:35:47 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-09-29 11:20:22 -0400 |
commit | 7feabb6412ea23edd298c0fa90e5aa6733eb4a42 (patch) | |
tree | bfafe961aeb5449a71fbb389172b3a6c68b56e7c /drivers/parport | |
parent | 37979e1546a790c44adbc7f27a85569944480ebc (diff) |
pcmcia: move config_{base,index,regs} to struct pcmcia_device
Several drivers prefer to explicitly set config_{base,index,regs},
formerly known as ConfigBase, ConfigIndex and Present. Instead of
passing these values inside config_req_t, store it in struct
pcmcia_device.
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> (for drivers/bluetooth)
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/parport_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index afd946e15ee7..8faf634987e3 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
@@ -144,7 +144,7 @@ static int parport_config_check(struct pcmcia_device *p_dev, | |||
144 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; | 144 | cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; |
145 | p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK; | 145 | p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK; |
146 | if (epp_mode) | 146 | if (epp_mode) |
147 | p_dev->conf.ConfigIndex |= FORCE_EPP_MODE; | 147 | p_dev->config_index |= FORCE_EPP_MODE; |
148 | p_dev->resource[0]->start = io->win[0].base; | 148 | p_dev->resource[0]->start = io->win[0].base; |
149 | p_dev->resource[0]->end = io->win[0].len; | 149 | p_dev->resource[0]->end = io->win[0].len; |
150 | if (io->nwin == 2) { | 150 | if (io->nwin == 2) { |