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

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

pcmcia: Pass struct pcmcia_device to pcmcia_release_window() 



No logic changes, just pass struct pcmcia_device to pcmcia_release_window().

[linux@dominikbrodowski.net: update to 2.6.31]
CC: netdev@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 78a14e27

drivers/char/pcmcia/ipwireless/main.c

+7 −7
Original line number Diff line number Diff line
@@ -168,15 +168,15 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, 
	return 0;



exit3:

	pcmcia_release_window(ipw->handle_attr_memory);

	pcmcia_release_window(p_dev, ipw->handle_attr_memory);

exit2:

	if (ipw->common_memory) {

		release_mem_region(ipw->request_common_memory.Base,

				ipw->request_common_memory.Size);

		iounmap(ipw->common_memory);

		pcmcia_release_window(ipw->handle_common_memory);

		pcmcia_release_window(p_dev, ipw->handle_common_memory);

	} else

		pcmcia_release_window(ipw->handle_common_memory);

		pcmcia_release_window(p_dev, ipw->handle_common_memory);

exit1:

	release_resource(io_resource);

	pcmcia_disable_device(p_dev);
@@ -260,13 +260,13 @@ static int config_ipwireless(struct ipw_dev *ipw) 
		release_mem_region(ipw->request_attr_memory.Base,

				ipw->request_attr_memory.Size);

		iounmap(ipw->attr_memory);

		pcmcia_release_window(ipw->handle_attr_memory);

		pcmcia_release_window(link, ipw->handle_attr_memory);

	}

	if (ipw->common_memory) {

		release_mem_region(ipw->request_common_memory.Base,

				ipw->request_common_memory.Size);

		iounmap(ipw->common_memory);

		pcmcia_release_window(ipw->handle_common_memory);

		pcmcia_release_window(link, ipw->handle_common_memory);

	}

	pcmcia_disable_device(link);

	return -1;
@@ -287,9 +287,9 @@ static void release_ipwireless(struct ipw_dev *ipw) 
		iounmap(ipw->attr_memory);

	}

	if (ipw->common_memory)

		pcmcia_release_window(ipw->handle_common_memory);

		pcmcia_release_window(ipw->link, ipw->handle_common_memory);

	if (ipw->attr_memory)

		pcmcia_release_window(ipw->handle_attr_memory);

		pcmcia_release_window(ipw->link, ipw->handle_attr_memory);



	/* Break the link with Card Services */

	pcmcia_disable_device(ipw->link);

drivers/mtd/maps/pcmciamtd.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static void pcmciamtd_release(struct pcmcia_device *link) 
			iounmap(dev->win_base);

			dev->win_base = NULL;

		}

		pcmcia_release_window(link->win);

		pcmcia_release_window(link, link->win);

	}

	pcmcia_disable_device(link);

}

drivers/net/pcmcia/fmvj18x_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id) 
    }



    iounmap(base);

    j = pcmcia_release_window(link->win);

    j = pcmcia_release_window(link, link->win);

    return (i != 0x200) ? 0 : -1;



} /* fmvj18x_get_hwinfo */
@@ -666,7 +666,7 @@ static void fmvj18x_release(struct pcmcia_device *link) 
	tmp = lp->base;

	lp->base = NULL;    /* set NULL before iounmap */

	iounmap(tmp);

	j = pcmcia_release_window(link->win);

	j = pcmcia_release_window(link, link->win);

    }



    pcmcia_disable_device(link);

drivers/net/pcmcia/ibmtr_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static void ibmtr_release(struct pcmcia_device *link) 
	if (link->win) {

		struct tok_info *ti = netdev_priv(dev);

		iounmap(ti->mmio);

		pcmcia_release_window(info->sram_win_handle);

		pcmcia_release_window(link, info->sram_win_handle);

	}

	pcmcia_disable_device(link);

}

drivers/net/pcmcia/pcnet_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link) 
    }



    iounmap(virt);

    j = pcmcia_release_window(link->win);

    j = pcmcia_release_window(link, link->win);

    return (i < NR_INFO) ? hw_info+i : NULL;

} /* get_hwinfo */
@@ -1513,7 +1513,7 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg, 
    pcnet_reset_8390(dev);

    if (i != (TX_PAGES<<8)) {

	iounmap(info->base);

	pcmcia_release_window(link->win);

	pcmcia_release_window(link, link->win);

	info->base = NULL; link->win = NULL;

	goto failed;

    }