Commit 385ee871 authored Jan 06, 2010 by 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: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

parent 3970dd8c

drivers/pcmcia/cs.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/pcmcia/cs_internal.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -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);

drivers/pcmcia/rsrc_mgr.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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)
		{