mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()

Browse source 
No logic changes, just pass struct pcmcia_socket to pcmcia_get_mem_page()

[linux@dominikbrodowski.net: update to 2.6.31]
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Magnus Damm 2006-12-13 19:46:48 +09:00 committed by Dominik Brodowski
parent 868575d1e8
commit 16456ebabf
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/pcmcia/cs_internal.h
View file

@ -227,6 +227,8 @@ extern void pcmcia_put_dev(struct pcmcia_device *p_dev);
struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,
unsigned int function); unsigned int function);
int pcmcia_get_mem_page(struct pcmcia_socket *skt, window_handle_t win,
memreq_t *req);
/* pcmcia_ioctl.c */ /* pcmcia_ioctl.c */
extern void __init pcmcia_setup_ioctl(void); extern void __init pcmcia_setup_ioctl(void);

2
drivers/pcmcia/pcmcia_ioctl.c
View file

@ -924,7 +924,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
buf->win_info.handle->index + 1, &buf->win_info.window); buf->win_info.handle->index + 1, &buf->win_info.window);
break; break;
case DS_GET_MEM_PAGE: case DS_GET_MEM_PAGE:
ret = pcmcia_get_mem_page(buf->win_info.handle, ret = pcmcia_get_mem_page(s, buf->win_info.handle,
&buf->win_info.map); &buf->win_info.map);
break; break;
case DS_REPLACE_CIS: case DS_REPLACE_CIS:

5
drivers/pcmcia/pcmcia_resource.c
View file

@ -223,8 +223,11 @@ EXPORT_SYMBOL(pcmcia_get_window);
* *
* Change the card address of an already open memory window. * Change the card address of an already open memory window.
*/ */
int pcmcia_get_mem_page(window_handle_t win, memreq_t *req) int pcmcia_get_mem_page(struct pcmcia_socket *skt, window_handle_t wh,
memreq_t *req)
{ {
window_handle_t win = wh;
if ((win == NULL) || (win->magic != WINDOW_MAGIC)) if ((win == NULL) || (win->magic != WINDOW_MAGIC))
return -EINVAL; return -EINVAL;
req->Page = 0; req->Page = 0;

2
include/pcmcia/ds.h
View file

@ -202,8 +202,6 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req,
window_handle_t *wh); window_handle_t *wh);
int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t win); int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t win);
int pcmcia_get_mem_page(window_handle_t win, memreq_t *req);
int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t win, int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t win,
memreq_t *req); memreq_t *req);