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

Commit 6838b03f authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer 



pcmcia_request_window() only needs a pointer to struct pcmcia_device, not
a pointer to a pointer.

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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 82f88e36

drivers/char/pcmcia/ipwireless/main.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, 
		ipw->request_common_memory.Size = 0x1000;

	ipw->request_common_memory.AccessSpeed = 0;



	ret = pcmcia_request_window(&p_dev, &ipw->request_common_memory,

	ret = pcmcia_request_window(p_dev, &ipw->request_common_memory,

				&ipw->handle_common_memory);



	if (ret != 0)
@@ -145,7 +145,7 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, 
	ipw->request_attr_memory.Size = 0;	/* this used to be 0x1000 */

	ipw->request_attr_memory.AccessSpeed = 0;



	ret = pcmcia_request_window(&p_dev, &ipw->request_attr_memory,

	ret = pcmcia_request_window(p_dev, &ipw->request_attr_memory,

				&ipw->handle_attr_memory);



	if (ret != 0)

drivers/isdn/hisax/sedlbauer_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev, 
		req->Base = mem->win[0].host_addr;

		req->Size = mem->win[0].len;

		req->AccessSpeed = 0;

		if (pcmcia_request_window(&p_dev, req, &p_dev->win) != 0)

		if (pcmcia_request_window(p_dev, req, &p_dev->win) != 0)

			return -ENODEV;

		map.Page = 0;

		map.CardOffset = mem->win[0].card_addr;

drivers/mtd/maps/pcmciamtd.c

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static int pcmciamtd_config(struct pcmcia_device *link) 
		int ret;

		DEBUG(2, "requesting window with size = %dKiB memspeed = %d",

		      req.Size >> 10, req.AccessSpeed);

		ret = pcmcia_request_window(&link, &req, &link->win);

		ret = pcmcia_request_window(link, &req, &link->win);

		DEBUG(2, "ret = %d dev->win_size = %d", ret, dev->win_size);

		if(ret) {

			req.Size >>= 1;

drivers/net/pcmcia/fmvj18x_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id) 
    req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;

    req.Base = 0; req.Size = 0;

    req.AccessSpeed = 0;

    i = pcmcia_request_window(&link, &req, &link->win);

    i = pcmcia_request_window(link, &req, &link->win);

    if (i != 0)

	return -1;
@@ -618,7 +618,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link) 
    req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;

    req.Base = 0; req.Size = 0;

    req.AccessSpeed = 0;

    i = pcmcia_request_window(&link, &req, &link->win);

    i = pcmcia_request_window(link, &req, &link->win);

    if (i != 0)

	return -1;

drivers/net/pcmcia/ibmtr_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) 
    req.Base = 0; 

    req.Size = 0x2000;

    req.AccessSpeed = 250;

    ret = pcmcia_request_window(&link, &req, &link->win);

    ret = pcmcia_request_window(link, &req, &link->win);

    if (ret)

	    goto failed;
@@ -263,7 +263,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) 
    req.Base = 0;

    req.Size = sramsize * 1024;

    req.AccessSpeed = 250;

    ret = pcmcia_request_window(&link, &req, &info->sram_win_handle);

    ret = pcmcia_request_window(link, &req, &info->sram_win_handle);

    if (ret)

	    goto failed;