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/pcmcia/pcmcia_cis.c | |
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/pcmcia/pcmcia_cis.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_cis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_cis.c b/drivers/pcmcia/pcmcia_cis.c index 0ac54da15885..ac47cc4e20e8 100644 --- a/drivers/pcmcia/pcmcia_cis.c +++ b/drivers/pcmcia/pcmcia_cis.c | |||
@@ -151,7 +151,7 @@ static int pcmcia_do_loop_config(tuple_t *tuple, cisparse_t *parse, void *priv) | |||
151 | struct pcmcia_cfg_mem *cfg_mem = priv; | 151 | struct pcmcia_cfg_mem *cfg_mem = priv; |
152 | 152 | ||
153 | /* default values */ | 153 | /* default values */ |
154 | cfg_mem->p_dev->conf.ConfigIndex = cfg->index; | 154 | cfg_mem->p_dev->config_index = cfg->index; |
155 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) | 155 | if (cfg->flags & CISTPL_CFTABLE_DEFAULT) |
156 | cfg_mem->dflt = *cfg; | 156 | cfg_mem->dflt = *cfg; |
157 | 157 | ||