diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-06 11:23:58 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-24 19:57:54 +0100 |
| commit | 385ee871092a524869c71a8180888aadcd6ca36d (patch) | |
| tree | 8c40bebe2654d36f90fb8044f3fcf2f9bdbbf221 | |
| parent | 3970dd8c5169505f0cc5e4c3e2fde7bdd9bbad3e (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.c | 3 | ||||
| -rw-r--r-- | drivers/pcmcia/cs_internal.h | 3 | ||||
| -rw-r--r-- | drivers/pcmcia/rsrc_mgr.c | 6 |
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) 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 9a3bbad7761b..7f86d09a5830 100644 --- 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 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, } 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) { |