aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/pcnet_cs.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2006-12-13 05:46:43 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2009-11-28 12:02:13 -0500
commit868575d1e87ff2091800aea816972ddb46de60d5 (patch)
tree95c50968098815dfe066e960922c4be3b003b27f /drivers/net/pcmcia/pcnet_cs.c
parentf5560da549ea2e32dd41e36548c0e7dee3d4aabb (diff)
pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
No logic changes, just pass struct pcmcia_device to pcmcia_map_mem_page() [linux@dominikbrodowski.net: update to 2.6.31] CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: linux-scsi@vger.kernel.org CC: Jiri Kosina <jkosina@suse.cz> Acked-by: Karsten Keil <keil@b1-systems.de> (for ISDN) Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/pcmcia/pcnet_cs.c')
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 4156a6c5811e..75e68946455e 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -325,7 +325,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)
325 mem.Page = 0; 325 mem.Page = 0;
326 for (i = 0; i < NR_INFO; i++) { 326 for (i = 0; i < NR_INFO; i++) {
327 mem.CardOffset = hw_info[i].offset & ~(req.Size-1); 327 mem.CardOffset = hw_info[i].offset & ~(req.Size-1);
328 pcmcia_map_mem_page(link->win, &mem); 328 pcmcia_map_mem_page(link, link->win, &mem);
329 base = &virt[hw_info[i].offset & (req.Size-1)]; 329 base = &virt[hw_info[i].offset & (req.Size-1)];
330 if ((readb(base+0) == hw_info[i].a0) && 330 if ((readb(base+0) == hw_info[i].a0) &&
331 (readb(base+2) == hw_info[i].a1) && 331 (readb(base+2) == hw_info[i].a1) &&
@@ -1499,7 +1499,7 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg,
1499 offset = mem.CardOffset % window_size; 1499 offset = mem.CardOffset % window_size;
1500 mem.CardOffset -= offset; 1500 mem.CardOffset -= offset;
1501 mem.Page = 0; 1501 mem.Page = 0;
1502 ret = pcmcia_map_mem_page(link->win, &mem); 1502 ret = pcmcia_map_mem_page(link, link->win, &mem);
1503 if (ret) 1503 if (ret)
1504 goto failed; 1504 goto failed;
1505 1505