提交 385ee871 编写于 作者: D Dominik Brodowski

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: NWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>
上级 3970dd8c
...@@ -283,7 +283,8 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket) ...@@ -283,7 +283,8 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket)
up_write(&pcmcia_socket_list_rwsem); up_write(&pcmcia_socket_list_rwsem);
/* wait for sysfs to drop all references */ /* 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); wait_for_completion(&socket->socket_released);
} /* pcmcia_unregister_socket */ } /* pcmcia_unregister_socket */
EXPORT_SYMBOL(pcmcia_unregister_socket); EXPORT_SYMBOL(pcmcia_unregister_socket);
......
...@@ -95,9 +95,6 @@ struct pccard_resource_ops { ...@@ -95,9 +95,6 @@ struct pccard_resource_ops {
/* cistpl.c */ /* cistpl.c */
int verify_cis_cache(struct pcmcia_socket *s); int verify_cis_cache(struct pcmcia_socket *s);
/* rsrc_mgr.c */
void release_resource_db(struct pcmcia_socket *s);
/* socket_sysfs.c */ /* socket_sysfs.c */
extern int pccard_sysfs_add_socket(struct device *dev); extern int pccard_sysfs_add_socket(struct device *dev);
extern void pccard_sysfs_remove_socket(struct device *dev); extern void pccard_sysfs_remove_socket(struct device *dev);
......
...@@ -58,12 +58,6 @@ struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align, ...@@ -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); 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) static int static_init(struct pcmcia_socket *s)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册