aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pcmcia_resource.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2006-12-13 05:46:38 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2009-11-28 12:01:26 -0500
commitf5560da549ea2e32dd41e36548c0e7dee3d4aabb (patch)
tree604c41db48ba2e497857ceb2137099d2f0d96d3b /drivers/pcmcia/pcmcia_resource.c
parent78a14e273d93dfbea9673f9b10398c538096302d (diff)
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: Magnus Damm <damm@opensource.se> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r--drivers/pcmcia/pcmcia_resource.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index cda48ea9b6fd..820a6e5868e8 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -442,9 +442,10 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)
442} /* pcmcia_release_irq */ 442} /* pcmcia_release_irq */
443 443
444 444
445int pcmcia_release_window(window_handle_t win) 445int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t wh)
446{ 446{
447 struct pcmcia_socket *s; 447 struct pcmcia_socket *s;
448 window_handle_t win = wh;
448 449
449 if ((win == NULL) || (win->magic != WINDOW_MAGIC)) 450 if ((win == NULL) || (win->magic != WINDOW_MAGIC))
450 return -EINVAL; 451 return -EINVAL;
@@ -891,7 +892,7 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev) {
891 pcmcia_release_io(p_dev, &p_dev->io); 892 pcmcia_release_io(p_dev, &p_dev->io);
892 pcmcia_release_irq(p_dev, &p_dev->irq); 893 pcmcia_release_irq(p_dev, &p_dev->irq);
893 if (p_dev->win) 894 if (p_dev->win)
894 pcmcia_release_window(p_dev->win); 895 pcmcia_release_window(p_dev, p_dev->win);
895} 896}
896EXPORT_SYMBOL(pcmcia_disable_device); 897EXPORT_SYMBOL(pcmcia_disable_device);
897 898