From b6513afbf1f5bf4145c1c00c0f8e16f2ac364b8c Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Wed, 6 Jan 2010 11:23:58 +0100
Subject: [PATCH] --- yaml --- r: 181974 b: refs/heads/master c:
 385ee871092a524869c71a8180888aadcd6ca36d h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/pcmcia/cs.c          | 3 ++-
 trunk/drivers/pcmcia/cs_internal.h | 3 ---
 trunk/drivers/pcmcia/rsrc_mgr.c    | 6 ------
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 78c0f4abd93a..b8e5d6a20ea9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3970dd8c5169505f0cc5e4c3e2fde7bdd9bbad3e
+refs/heads/master: 385ee871092a524869c71a8180888aadcd6ca36d
diff --git a/trunk/drivers/pcmcia/cs.c b/trunk/drivers/pcmcia/cs.c
index 137a5db2eca2..43c90f69a7a5 100644
--- a/trunk/drivers/pcmcia/cs.c
+++ b/trunk/drivers/pcmcia/cs.c
@@ -283,7 +283,8 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket)
 	up_write(&pcmcia_socket_list_rwsem);
 
 	/* wait for sysfs to drop all references */
-	release_resource_db(socket);
+	if (socket->resource_ops->exit)
+		socket->resource_ops->exit(socket);
 	wait_for_completion(&socket->socket_released);
 } /* pcmcia_unregister_socket */
 EXPORT_SYMBOL(pcmcia_unregister_socket);
diff --git a/trunk/drivers/pcmcia/cs_internal.h b/trunk/drivers/pcmcia/cs_internal.h
index 9a3bbad7761b..7f86d09a5830 100644
--- a/trunk/drivers/pcmcia/cs_internal.h
+++ b/trunk/drivers/pcmcia/cs_internal.h
@@ -95,9 +95,6 @@ struct pccard_resource_ops {
 /* cistpl.c */
 int verify_cis_cache(struct pcmcia_socket *s);
 
-/* rsrc_mgr.c */
-void release_resource_db(struct pcmcia_socket *s);
-
 /* socket_sysfs.c */
 extern int pccard_sysfs_add_socket(struct device *dev);
 extern void pccard_sysfs_remove_socket(struct device *dev);
diff --git a/trunk/drivers/pcmcia/rsrc_mgr.c b/trunk/drivers/pcmcia/rsrc_mgr.c
index 52db17263d8b..66c780073cd2 100644
--- a/trunk/drivers/pcmcia/rsrc_mgr.c
+++ b/trunk/drivers/pcmcia/rsrc_mgr.c
@@ -58,12 +58,6 @@ struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align,
 }
 EXPORT_SYMBOL(pcmcia_find_mem_region);
 
-void release_resource_db(struct pcmcia_socket *s)
-{
-	if (s->resource_ops->exit)
-		s->resource_ops->exit(s);
-}
-
 
 static int static_init(struct pcmcia_socket *s)
 {