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

Commit 868575d1 authored by Magnus Damm's avatar Magnus Damm Committed by Dominik Brodowski
Browse files

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: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent f5560da5

drivers/char/pcmcia/ipwireless/main.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, 
	memreq_common_memory.CardOffset = cfg->mem.win[0].card_addr;

	memreq_common_memory.Page = 0;



	ret = pcmcia_map_mem_page(ipw->handle_common_memory,

	ret = pcmcia_map_mem_page(p_dev, ipw->handle_common_memory,

				&memreq_common_memory);



	if (ret != 0)
@@ -154,7 +154,7 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, 
	memreq_attr_memory.CardOffset = 0;

	memreq_attr_memory.Page = 0;



	ret = pcmcia_map_mem_page(ipw->handle_attr_memory,

	ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory,

				&memreq_attr_memory);



	if (ret != 0)

drivers/isdn/hisax/sedlbauer_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev, 
			return -ENODEV;

		map.Page = 0;

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

		if (pcmcia_map_mem_page(p_dev->win, &map) != 0)

		if (pcmcia_map_mem_page(p_dev, p_dev->win, &map) != 0)

			return -ENODEV;

	}

	return 0;

drivers/mtd/maps/pcmciamtd.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static caddr_t remap_window(struct map_info *map, unsigned long to) 
		DEBUG(2, "Remapping window from 0x%8.8x to 0x%8.8x",

		      dev->offset, mrq.CardOffset);

		mrq.Page = 0;

		ret = pcmcia_map_mem_page(win, &mrq);

		ret = pcmcia_map_mem_page(dev->p_dev, win, &mrq);

		if (ret != 0)

			return NULL;

		dev->offset = mrq.CardOffset;

drivers/net/pcmcia/fmvj18x_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id) 
    base = ioremap(req.Base, req.Size);

    mem.Page = 0;

    mem.CardOffset = 0;

    pcmcia_map_mem_page(link->win, &mem);

    pcmcia_map_mem_page(link, link->win, &mem);



    /*

     *  MBH10304 CISTPL_FUNCE_LAN_NODE_ID format
@@ -630,7 +630,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link) 


    mem.Page = 0;

    mem.CardOffset = 0;

    i = pcmcia_map_mem_page(link->win, &mem);

    i = pcmcia_map_mem_page(link, link->win, &mem);

    if (i != 0) {

	iounmap(lp->base);

	lp->base = NULL;

drivers/net/pcmcia/ibmtr_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) 


    mem.CardOffset = mmiobase;

    mem.Page = 0;

    ret = pcmcia_map_mem_page(link->win, &mem);

    ret = pcmcia_map_mem_page(link, link->win, &mem);

    if (ret)

	    goto failed;

    ti->mmio = ioremap(req.Base, req.Size);
@@ -269,7 +269,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) 


    mem.CardOffset = srambase;

    mem.Page = 0;

    ret = pcmcia_map_mem_page(info->sram_win_handle, &mem);

    ret = pcmcia_map_mem_page(link, info->sram_win_handle, &mem);

    if (ret)

	    goto failed;