diff options
author | Magnus Damm <damm@opensource.se> | 2006-12-13 05:46:43 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-28 12:02:13 -0500 |
commit | 868575d1e87ff2091800aea816972ddb46de60d5 (patch) | |
tree | 95c50968098815dfe066e960922c4be3b003b27f /drivers/net/wireless/ray_cs.c | |
parent | f5560da549ea2e32dd41e36548c0e7dee3d4aabb (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/wireless/ray_cs.c')
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index ed328750de45..f719ffcb3c74 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -443,7 +443,7 @@ static int ray_config(struct pcmcia_device *link) | |||
443 | goto failed; | 443 | goto failed; |
444 | mem.CardOffset = 0x0000; | 444 | mem.CardOffset = 0x0000; |
445 | mem.Page = 0; | 445 | mem.Page = 0; |
446 | ret = pcmcia_map_mem_page(link->win, &mem); | 446 | ret = pcmcia_map_mem_page(link, link->win, &mem); |
447 | if (ret) | 447 | if (ret) |
448 | goto failed; | 448 | goto failed; |
449 | local->sram = ioremap(req.Base, req.Size); | 449 | local->sram = ioremap(req.Base, req.Size); |
@@ -459,7 +459,7 @@ static int ray_config(struct pcmcia_device *link) | |||
459 | goto failed; | 459 | goto failed; |
460 | mem.CardOffset = 0x8000; | 460 | mem.CardOffset = 0x8000; |
461 | mem.Page = 0; | 461 | mem.Page = 0; |
462 | ret = pcmcia_map_mem_page(local->rmem_handle, &mem); | 462 | ret = pcmcia_map_mem_page(link, local->rmem_handle, &mem); |
463 | if (ret) | 463 | if (ret) |
464 | goto failed; | 464 | goto failed; |
465 | local->rmem = ioremap(req.Base, req.Size); | 465 | local->rmem = ioremap(req.Base, req.Size); |
@@ -475,7 +475,7 @@ static int ray_config(struct pcmcia_device *link) | |||
475 | goto failed; | 475 | goto failed; |
476 | mem.CardOffset = 0x0000; | 476 | mem.CardOffset = 0x0000; |
477 | mem.Page = 0; | 477 | mem.Page = 0; |
478 | ret = pcmcia_map_mem_page(local->amem_handle, &mem); | 478 | ret = pcmcia_map_mem_page(link, local->amem_handle, &mem); |
479 | if (ret) | 479 | if (ret) |
480 | goto failed; | 480 | goto failed; |
481 | local->amem = ioremap(req.Base, req.Size); | 481 | local->amem = ioremap(req.Base, req.Size); |