[PCMCIA] Make cb_release_cis_mem() local to cardbus.c

The cardbus CIS parsing code does not use the PCMCIA resource
subsystem, so there isn't any point in freeing its memory when
we remove PCMCIA memory resources.  We also free CIS resources
immediately prior to calling cb_free().  We might as well move
the function call into cb_free(), thereby making all references
to cb_release_cis_mem() local to cardbus.c

drivers/pcmcia/cardbus.c

@@ -123,7 +123,7 @@ static u_int xlate_rom_addr(u_char * b, u_int addr)
     
 =====================================================================*/
 
-void cb_release_cis_mem(socket_info_t * s)
+static void cb_release_cis_mem(socket_info_t * s)
 {
 	if (s->cb_cis_virt) {
 		DEBUG(1, "cs: cb_release_cis_mem()\n");
@@ -270,6 +270,8 @@ void cb_free(socket_info_t * s)
 {
 	struct pci_dev *bridge = s->cap.cb_dev;
 
+	cb_release_cis_mem(s);
+
 	if (bridge)
 		pci_remove_behind_bridge(bridge);
 }

drivers/pcmcia/cs.c

@@ -485,7 +485,6 @@ static void shutdown_socket(socket_info_t *s)
     set_socket(s, &s->socket);
     /* */
 #ifdef CONFIG_CARDBUS
-    cb_release_cis_mem(s);
     cb_free(s);
 #endif
     s->functions = 0;

drivers/pcmcia/cs_internal.h

@@ -196,7 +196,6 @@ typedef struct socket_info_t {
 int cb_alloc(socket_info_t *s);
 void cb_free(socket_info_t *s);
 int read_cb_mem(socket_info_t *s, int space, u_int addr, u_int len, void *ptr);
-void cb_release_cis_mem(socket_info_t *s);
 
 /* In cistpl.c */
 int read_cis_mem(socket_info_t *s, int attr,

drivers/pcmcia/rsrc_mgr.c

@@ -745,9 +745,6 @@ static int adjust_memory(adjust_t *adj)
 	if (ret == CS_SUCCESS) {
 	    for (i = 0; i < sockets; i++) {
 		release_cis_mem(socket_table[i]);
-#ifdef CONFIG_CARDBUS
-		cb_release_cis_mem(socket_table[i]);
-#endif
 	    }
 	}
 	break;