[PATCH 01/04] pcmcia: Pass struct pcmcia_device to pcmcia_release_window()

[Magnus Damm]

pcmcia: Pass struct pcmcia_device to pcmcia_release_window()

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

Signed-off-by: Magnus Damm <damm at opensource.se>
---

 Applies to 2.6.19-git19

 drivers/mtd/maps/pcmciamtd.c     |    2 +-
 drivers/net/pcmcia/fmvj18x_cs.c  |    4 ++--
 drivers/net/pcmcia/ibmtr_cs.c    |    2 +-
 drivers/net/pcmcia/pcnet_cs.c    |    4 ++--
 drivers/net/wireless/ray_cs.c    |    4 ++--
 drivers/pcmcia/pcmcia_resource.c |    5 +++--
 include/pcmcia/cs.h              |    2 +-
 7 files changed, 12 insertions(+), 11 deletions(-)

--- 0001/drivers/mtd/maps/pcmciamtd.c
+++ work/drivers/mtd/maps/pcmciamtd.c	2006-12-13 12:57:36.000000000 +0900
@@ -351,7 +351,7 @@ static void pcmciamtd_release(struct pcm
 			iounmap(dev->win_base);
 			dev->win_base = NULL;
 		}
-		pcmcia_release_window(link->win);
+		pcmcia_release_window(link, link->win);
 	}
 	pcmcia_disable_device(link);
 }
--- 0002/drivers/net/pcmcia/fmvj18x_cs.c
+++ work/drivers/net/pcmcia/fmvj18x_cs.c	2006-12-13 12:57:36.000000000 +0900
@@ -578,7 +578,7 @@ static int fmvj18x_get_hwinfo(struct pcm
     }
 
     iounmap(base);
-    j = pcmcia_release_window(link->win);
+    j = pcmcia_release_window(link, link->win);
     if (j != CS_SUCCESS)
 	cs_error(link, ReleaseWindow, j);
     return (i != 0x200) ? 0 : -1;
@@ -621,7 +621,7 @@ static int fmvj18x_setup_mfc(struct pcmc
     writeb(0x8, base+0x822);	/* Config and Status Register */
 
     iounmap(base);
-    j = pcmcia_release_window(link->win);
+    j = pcmcia_release_window(link, link->win);
     if (j != CS_SUCCESS)
 	cs_error(link, ReleaseWindow, j);
     return 0;
--- 0002/drivers/net/pcmcia/ibmtr_cs.c
+++ work/drivers/net/pcmcia/ibmtr_cs.c	2006-12-13 12:57:36.000000000 +0900
@@ -330,7 +330,7 @@ static void ibmtr_release(struct pcmcia_
 	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);
 }
--- 0002/drivers/net/pcmcia/pcnet_cs.c
+++ work/drivers/net/pcmcia/pcnet_cs.c	2006-12-13 12:57:36.000000000 +0900
@@ -332,7 +332,7 @@ static hw_info_t *get_hwinfo(struct pcmc
     }
 
     iounmap(virt);
-    j = pcmcia_release_window(link->win);
+    j = pcmcia_release_window(link, link->win);
     if (j != CS_SUCCESS)
 	cs_error(link, ReleaseWindow, j);
     return (i < NR_INFO) ? hw_info+i : NULL;
@@ -1509,7 +1509,7 @@ static int setup_shmem_window(struct pcm
     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;
     }
--- 0002/drivers/net/wireless/ray_cs.c
+++ work/drivers/net/wireless/ray_cs.c	2006-12-13 12:57:36.000000000 +0900
@@ -798,9 +798,9 @@ static void ray_release(struct pcmcia_de
     iounmap(local->rmem);
     iounmap(local->amem);
     /* Do bother checking to see if these succeed or not */
-    i = pcmcia_release_window(local->amem_handle);
+    i = pcmcia_release_window(link, local->amem_handle);
     if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local->amem) ret = %x\n",i);
-    i = pcmcia_release_window(local->rmem_handle);
+    i = pcmcia_release_window(link, local->rmem_handle);
     if ( i != CS_SUCCESS ) DEBUG(0,"ReleaseWindow(local->rmem) ret = %x\n",i);
     pcmcia_disable_device(link);
 
--- 0005/drivers/pcmcia/pcmcia_resource.c
+++ work/drivers/pcmcia/pcmcia_resource.c	2006-12-13 12:57:36.000000000 +0900
@@ -581,9 +581,10 @@ static int pcmcia_release_irq(struct pcm
 } /* pcmcia_release_irq */
 
 
-int pcmcia_release_window(window_handle_t win)
+int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t wh)
 {
 	struct pcmcia_socket *s;
+	window_handle_t win = wh;
 
 	if ((win == NULL) || (win->magic != WINDOW_MAGIC))
 		return CS_BAD_HANDLE;
@@ -967,6 +968,6 @@ void pcmcia_disable_device(struct pcmcia
 	pcmcia_release_io(p_dev, &p_dev->io);
 	pcmcia_release_irq(p_dev, &p_dev->irq);
 	if (&p_dev->win)
-		pcmcia_release_window(p_dev->win);
+		pcmcia_release_window(p_dev, p_dev->win);
 }
 EXPORT_SYMBOL(pcmcia_disable_device);
--- 0003/include/pcmcia/cs.h
+++ work/include/pcmcia/cs.h	2006-12-13 12:57:36.000000000 +0900
@@ -377,11 +377,11 @@ int pcmcia_get_status(struct pcmcia_devi
 int pcmcia_get_mem_page(window_handle_t win, memreq_t *req);
 int pcmcia_map_mem_page(window_handle_t win, memreq_t *req);
 int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod);
-int pcmcia_release_window(window_handle_t win);
 int pcmcia_request_configuration(struct pcmcia_device *p_dev, config_req_t *req);
 int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req);
 int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req);
 int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_handle_t *wh);
+int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t wh);
 int pcmcia_suspend_card(struct pcmcia_socket *skt);
 int pcmcia_resume_card(struct pcmcia_socket *skt);
 int pcmcia_eject_card(struct pcmcia_socket *skt);