Skip to content

Commit

Permalink
pcmcia: remove useless indirection
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dominik Brodowski committed Jan 24, 2010
1 parent 3970dd8 commit 385ee87
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
3 changes: 2 additions & 1 deletion drivers/pcmcia/cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions drivers/pcmcia/cs_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 0 additions & 6 deletions drivers/pcmcia/rsrc_mgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 385ee87

Please sign in to comment.