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

Commit b5cb259e authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: remove memreq_t 



Page already had to be set to 0; Offset can easily be passed as
parameter to pcmcia_map_mem_page.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: linux-bluetooth@vger.kernel.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Michael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent a3d0d4d8

drivers/char/pcmcia/ipwireless/main.c

+2 −12
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, 
{

	struct ipw_dev *ipw = priv_data;

	struct resource *io_resource;

	memreq_t memreq_attr_memory;

	memreq_t memreq_common_memory;

	int ret;



	p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
@@ -121,11 +119,8 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, 
	if (ret != 0)

		goto exit1;



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

	memreq_common_memory.Page = 0;



	ret = pcmcia_map_mem_page(p_dev, ipw->handle_common_memory,

				&memreq_common_memory);

				cfg->mem.win[0].card_addr);



	if (ret != 0)

		goto exit2;
@@ -150,12 +145,7 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, 
	if (ret != 0)

		goto exit2;



	memreq_attr_memory.CardOffset = 0;

	memreq_attr_memory.Page = 0;



	ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory,

				&memreq_attr_memory);



	ret = pcmcia_map_mem_page(p_dev, ipw->handle_attr_memory, 0);

	if (ret != 0)

		goto exit3;

drivers/isdn/hisax/sedlbauer_cs.c

+3 −4
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev, 
	*/

	if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {

		cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;

		memreq_t map;

		req->Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;

		req->Attributes |= WIN_ENABLE;

		req->Base = mem->win[0].host_addr;
@@ -240,9 +239,9 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev, 
		req->AccessSpeed = 0;

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

			return -ENODEV;

		map.Page = 0;

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

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



		if (pcmcia_map_mem_page(p_dev, p_dev->win,

						mem->win[0].card_addr) != 0)

			return -ENODEV;

	}

	return 0;

drivers/mtd/maps/pcmciamtd.c

+6 −7
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static caddr_t remap_window(struct map_info *map, unsigned long to) 
{

	struct pcmciamtd_dev *dev = (struct pcmciamtd_dev *)map->map_priv_1;

	window_handle_t win = (window_handle_t)map->map_priv_2;

	memreq_t mrq;

	unsigned int offset;

	int ret;



	if (!pcmcia_dev_present(dev->p_dev)) {
@@ -110,15 +110,14 @@ static caddr_t remap_window(struct map_info *map, unsigned long to) 
		return 0;

	}



	mrq.CardOffset = to & ~(dev->win_size-1);

	if(mrq.CardOffset != dev->offset) {

	offset = to & ~(dev->win_size-1);

	if (offset != dev->offset) {

		DEBUG(2, "Remapping window from 0x%8.8x to 0x%8.8x",

		      dev->offset, mrq.CardOffset);

		mrq.Page = 0;

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

		      dev->offset, offset);

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

		if (ret != 0)

			return NULL;

		dev->offset = mrq.CardOffset;

		dev->offset = offset;

	}

	return dev->win_base + (to & (dev->win_size-1));

}

drivers/net/pcmcia/fmvj18x_cs.c

+2 −8
Original line number Diff line number Diff line
@@ -545,7 +545,6 @@ static int fmvj18x_config(struct pcmcia_device *link) 
static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)

{

    win_req_t req;

    memreq_t mem;

    u_char __iomem *base;

    int i, j;
@@ -558,9 +557,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id) 
	return -1;



    base = ioremap(req.Base, req.Size);

    mem.Page = 0;

    mem.CardOffset = 0;

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

    pcmcia_map_mem_page(link, link->win, 0);



    /*

     *  MBH10304 CISTPL_FUNCE_LAN_NODE_ID format
@@ -594,7 +591,6 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id) 
static int fmvj18x_setup_mfc(struct pcmcia_device *link)

{

    win_req_t req;

    memreq_t mem;

    int i;

    struct net_device *dev = link->priv;

    unsigned int ioaddr;
@@ -614,9 +610,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link) 
	return -1;

    }



    mem.Page = 0;

    mem.CardOffset = 0;

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

    i = pcmcia_map_mem_page(link, link->win, 0);

    if (i != 0) {

	iounmap(lp->base);

	lp->base = NULL;

drivers/net/pcmcia/ibmtr_cs.c

+3 −8
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) 
    struct net_device *dev = info->dev;

    struct tok_info *ti = netdev_priv(dev);

    win_req_t req;

    memreq_t mem;

    int i, ret;



    dev_dbg(&link->dev, "ibmtr_config\n");
@@ -250,9 +249,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) 
    if (ret)

	    goto failed;



    mem.CardOffset = mmiobase;

    mem.Page = 0;

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

    ret = pcmcia_map_mem_page(link, link->win, mmiobase);

    if (ret)

	    goto failed;

    ti->mmio = ioremap(req.Base, req.Size);
@@ -267,13 +264,11 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) 
    if (ret)

	    goto failed;



    mem.CardOffset = srambase;

    mem.Page = 0;

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

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

    if (ret)

	    goto failed;



    ti->sram_base = mem.CardOffset >> 12;

    ti->sram_base = srambase >> 12;

    ti->sram_virt = ioremap(req.Base, req.Size);

    ti->sram_phys = req.Base;