aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-06 05:23:58 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2010-01-24 13:57:54 -0500
commit385ee871092a524869c71a8180888aadcd6ca36d (patch)
tree8c40bebe2654d36f90fb8044f3fcf2f9bdbbf221
parent3970dd8c5169505f0cc5e4c3e2fde7bdd9bbad3e (diff)
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>
-rw-r--r--drivers/pcmcia/cs.c3
-rw-r--r--drivers/pcmcia/cs_internal.h3
-rw-r--r--drivers/pcmcia/rsrc_mgr.c6
3 files changed, 2 insertions, 10 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 137a5db2eca2..43c90f69a7a5 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -283,7 +283,8 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket)
283 up_write(&pcmcia_socket_list_rwsem); 283 up_write(&pcmcia_socket_list_rwsem);
284 284
285 /* wait for sysfs to drop all references */ 285 /* wait for sysfs to drop all references */
286 release_resource_db(socket); 286 if (socket->resource_ops->exit)
287 socket->resource_ops->exit(socket);
287 wait_for_completion(&socket->socket_released); 288 wait_for_completion(&socket->socket_released);
288} /* pcmcia_unregister_socket */ 289} /* pcmcia_unregister_socket */
289EXPORT_SYMBOL(pcmcia_unregister_socket); 290EXPORT_SYMBOL(pcmcia_unregister_socket);
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index 9a3bbad7761b..7f86d09a5830 100644
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -95,9 +95,6 @@ struct pccard_resource_ops {
95/* cistpl.c */ 95/* cistpl.c */
96int verify_cis_cache(struct pcmcia_socket *s); 96int verify_cis_cache(struct pcmcia_socket *s);
97 97
98/* rsrc_mgr.c */
99void release_resource_db(struct pcmcia_socket *s);
100
101/* socket_sysfs.c */ 98/* socket_sysfs.c */
102extern int pccard_sysfs_add_socket(struct device *dev); 99extern int pccard_sysfs_add_socket(struct device *dev);
103extern void pccard_sysfs_remove_socket(struct device *dev); 100extern void pccard_sysfs_remove_socket(struct device *dev);
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index 52db17263d8b..66c780073cd2 100644
--- 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,
58} 58}
59EXPORT_SYMBOL(pcmcia_find_mem_region); 59EXPORT_SYMBOL(pcmcia_find_mem_region);
60 60
61void release_resource_db(struct pcmcia_socket *s)
62{
63 if (s->resource_ops->exit)
64 s->resource_ops->exit(s);
65}
66
67 61
68static int static_init(struct pcmcia_socket *s) 62static int static_init(struct pcmcia_socket *s)
69{ 63{