pcmcia: remove useless indirection

As release_resoure_db() used to be called only from one place, and
it's a two-line function, remove it.

Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 137a5db2eca240945eacc9016958da0936a7b84c..43c90f69a7a597fe66232480c67005690dc284eb 100644 (file)
--- a/drivers/pcmcia/cs.c
+++ b/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/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index 9a3bbad7761b0eb516105c3c7d2b2def50f91425..7f86d09a58308e5251f4443e6f447fe52de7118c 100644 (file)
--- a/drivers/pcmcia/cs_internal.h
+++ b/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/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index 52db17263d8bd9b0b7265040c0a3747ccc7be601..66c780073cd290d450efdfea076caf01560bfb6a 100644 (file)
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/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)
 {