aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-29 12:35:47 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-09-29 11:20:22 -0400
commit7feabb6412ea23edd298c0fa90e5aa6733eb4a42 (patch)
treebfafe961aeb5449a71fbb389172b3a6c68b56e7c /drivers/ide
parent37979e1546a790c44adbc7f27a85569944480ebc (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/ide')
-rw-r--r--drivers/ide/ide-cs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index cf7cb4953aa5..07e37876559c 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -227,8 +227,7 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
227 if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { 227 if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
228 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; 228 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
229 pdev->io_lines = io->flags & CISTPL_IO_LINES_MASK; 229 pdev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
230 230 pdev->config_index = cfg->index;
231 pdev->conf.ConfigIndex = cfg->index;
232 pdev->resource[0]->start = io->win[0].base; 231 pdev->resource[0]->start = io->win[0].base;
233 if (!(io->flags & CISTPL_IO_16BIT)) { 232 if (!(io->flags & CISTPL_IO_16BIT)) {
234 pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH; 233 pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;