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

Commit 0ca724d3 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: use struct resource for PCMCIA devices, part 2 



Use struct resource * also for iomem resources.

CC: linux-mtd@lists.infradead.org
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent b5cb259e

drivers/char/pcmcia/ipwireless/main.c

+2 −11
Original line number Diff line number Diff line
@@ -157,15 +157,12 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, 
	return 0;



exit3:

	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(p_dev, ipw->handle_common_memory);

	} else

		pcmcia_release_window(p_dev, ipw->handle_common_memory);

	}

exit1:

	release_resource(io_resource);

	pcmcia_disable_device(p_dev);
@@ -238,13 +235,12 @@ 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(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(link, ipw->handle_common_memory);

	}

	pcmcia_disable_device(link);

	return -1;
@@ -262,11 +258,6 @@ static void release_ipwireless(struct ipw_dev *ipw) 
				ipw->request_attr_memory.Size);

		iounmap(ipw->attr_memory);

	}

	if (ipw->common_memory)

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

	if (ipw->attr_memory)

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



	pcmcia_disable_device(ipw->link);

}

drivers/mtd/maps/pcmciamtd.c

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

			dev->win_base = NULL;

		}

		pcmcia_release_window(link, link->win);

	}

	pcmcia_disable_device(link);

}

drivers/net/pcmcia/ibmtr_cs.c

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

		struct tok_info *ti = netdev_priv(dev);

		iounmap(ti->mmio);

		pcmcia_release_window(link, info->sram_win_handle);

	}

	pcmcia_disable_device(link);

}

drivers/net/wireless/b43/pcmcia.c

+1 −2
Original line number Diff line number Diff line
@@ -76,8 +76,7 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) 
	dev->conf.Attributes = CONF_ENABLE_IRQ;

	dev->conf.IntType = INT_MEMORY_AND_IO;



	win.Attributes = WIN_ADDR_SPACE_MEM | WIN_MEMORY_TYPE_CM |

			 WIN_ENABLE | WIN_DATA_WIDTH_16 |

	win.Attributes =  WIN_ENABLE | WIN_DATA_WIDTH_16 |

			 WIN_USE_WAIT;

	win.Base = 0;

	win.Size = SSB_CORE_SIZE;

drivers/net/wireless/ray_cs.c

+0 −8
Original line number Diff line number Diff line
@@ -785,7 +785,6 @@ static void ray_release(struct pcmcia_device *link) 
{

	struct net_device *dev = link->priv;

	ray_dev_t *local = netdev_priv(dev);

	int i;



	dev_dbg(&link->dev, "ray_release\n");
@@ -794,13 +793,6 @@ static void ray_release(struct pcmcia_device *link) 
	iounmap(local->sram);

	iounmap(local->rmem);

	iounmap(local->amem);

	/* Do bother checking to see if these succeed or not */

	i = pcmcia_release_window(link, local->amem_handle);

	if (i != 0)

		dev_dbg(&link->dev, "ReleaseWindow(local->amem) ret = %x\n", i);

	i = pcmcia_release_window(link, local->rmem_handle);

	if (i != 0)

		dev_dbg(&link->dev, "ReleaseWindow(local->rmem) ret = %x\n", i);

	pcmcia_disable_device(link);



	dev_dbg(&link->dev, "ray_release ending\n");