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/net/pcmcia/ibmtr_cs.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/net/pcmcia/ibmtr_cs.c')
-rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index 1327f086d86..feedeeb17a5 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
@@ -153,7 +153,7 @@ static int __devinit ibmtr_attach(struct pcmcia_device *link) | |||
153 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; | 153 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; |
154 | link->resource[0]->end = 4; | 154 | link->resource[0]->end = 4; |
155 | link->conf.Attributes = CONF_ENABLE_IRQ; | 155 | link->conf.Attributes = CONF_ENABLE_IRQ; |
156 | link->conf.Present = PRESENT_OPTION; | 156 | link->config_regs = PRESENT_OPTION; |
157 | 157 | ||
158 | info->dev = dev; | 158 | info->dev = dev; |
159 | 159 | ||
@@ -212,8 +212,8 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
212 | 212 | ||
213 | dev_dbg(&link->dev, "ibmtr_config\n"); | 213 | dev_dbg(&link->dev, "ibmtr_config\n"); |
214 | 214 | ||
215 | link->conf.ConfigIndex = 0x61; | ||
216 | link->io_lines = 16; | 215 | link->io_lines = 16; |
216 | link->config_index = 0x61; | ||
217 | 217 | ||
218 | /* Determine if this is PRIMARY or ALTERNATE. */ | 218 | /* Determine if this is PRIMARY or ALTERNATE. */ |
219 | 219 | ||