Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16456eba authored by Magnus Damm's avatar Magnus Damm Committed by Dominik Brodowski
Browse files

pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page() 



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

[linux@dominikbrodowski.net: update to 2.6.31]
Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 868575d1

drivers/pcmcia/cs_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -227,6 +227,8 @@ extern void pcmcia_put_dev(struct pcmcia_device *p_dev); 


struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,

					unsigned int function);

int pcmcia_get_mem_page(struct pcmcia_socket *skt, window_handle_t win,

			memreq_t *req);



/* pcmcia_ioctl.c */

extern void __init pcmcia_setup_ioctl(void);

drivers/pcmcia/pcmcia_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ static int ds_ioctl(struct inode * inode, struct file * file, 
			buf->win_info.handle->index + 1, &buf->win_info.window);

	break;

    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);

	break;

    case DS_REPLACE_CIS:

drivers/pcmcia/pcmcia_resource.c

+4 −1
Original line number Diff line number Diff line
@@ -223,8 +223,11 @@ EXPORT_SYMBOL(pcmcia_get_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))

		return -EINVAL;

	req->Page = 0;

include/pcmcia/ds.h

+0 −2
Original line number Diff line number Diff line
@@ -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,

			  window_handle_t *wh);

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,

			memreq_t *req);