aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
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/pcmcia
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/pcmcia')
-rw-r--r--drivers/pcmcia/pcmcia_resource.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 820a6e5868e8..b60952a3df93 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -234,9 +234,12 @@ int pcmcia_get_mem_page(window_handle_t win, memreq_t *req)
234EXPORT_SYMBOL(pcmcia_get_mem_page); 234EXPORT_SYMBOL(pcmcia_get_mem_page);
235 235
236 236
237int pcmcia_map_mem_page(window_handle_t win, memreq_t *req) 237int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t wh,
238 memreq_t *req)
238{ 239{
239 struct pcmcia_socket *s; 240 struct pcmcia_socket *s;
241 window_handle_t win = wh;
242
240 if ((win == NULL) || (win->magic != WINDOW_MAGIC)) 243 if ((win == NULL) || (win->magic != WINDOW_MAGIC))
241 return -EINVAL; 244 return -EINVAL;
242 s = win->sock; 245 s = win->sock;