aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/ibmtr_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/ibmtr_cs.c')
-rw-r--r--drivers/net/pcmcia/ibmtr_cs.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index 3fd859570db3..c0b3cdd49c6a 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -211,7 +211,6 @@ static int __devinit ibmtr_config(struct pcmcia_device *link)
211 struct net_device *dev = info->dev; 211 struct net_device *dev = info->dev;
212 struct tok_info *ti = netdev_priv(dev); 212 struct tok_info *ti = netdev_priv(dev);
213 win_req_t req; 213 win_req_t req;
214 memreq_t mem;
215 int i, ret; 214 int i, ret;
216 215
217 dev_dbg(&link->dev, "ibmtr_config\n"); 216 dev_dbg(&link->dev, "ibmtr_config\n");
@@ -250,9 +249,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link)
250 if (ret) 249 if (ret)
251 goto failed; 250 goto failed;
252 251
253 mem.CardOffset = mmiobase; 252 ret = pcmcia_map_mem_page(link, link->win, mmiobase);
254 mem.Page = 0;
255 ret = pcmcia_map_mem_page(link, link->win, &mem);
256 if (ret) 253 if (ret)
257 goto failed; 254 goto failed;
258 ti->mmio = ioremap(req.Base, req.Size); 255 ti->mmio = ioremap(req.Base, req.Size);
@@ -267,13 +264,11 @@ static int __devinit ibmtr_config(struct pcmcia_device *link)
267 if (ret) 264 if (ret)
268 goto failed; 265 goto failed;
269 266
270 mem.CardOffset = srambase; 267 ret = pcmcia_map_mem_page(link, info->sram_win_handle, srambase);
271 mem.Page = 0;
272 ret = pcmcia_map_mem_page(link, info->sram_win_handle, &mem);
273 if (ret) 268 if (ret)
274 goto failed; 269 goto failed;
275 270
276 ti->sram_base = mem.CardOffset >> 12; 271 ti->sram_base = srambase >> 12;
277 ti->sram_virt = ioremap(req.Base, req.Size); 272 ti->sram_virt = ioremap(req.Base, req.Size);
278 ti->sram_phys = req.Base; 273 ti->sram_phys = req.Base;
279 274