Commit c0cad1e7 authored Jul 21, 2010 by Randy Dunlap Committed by Greg Kroah-Hartman Jul 22, 2010

Staging: batman-adv: don't use default init_module/cleanup_module function names



Fix two staging drivers to use module_init()/module_exit()
instead of default init_module() and cleanup_module() function names
so that there are no name conflicts when both are built-in.

drivers/staging/dt3155/built-in.o: In function `cleanup_module':
(.text+0xc0): multiple definition of `cleanup_module'
drivers/staging/batman-adv/built-in.o:(.text+0x330): first defined here
drivers/staging/dt3155/built-in.o: In function `init_module':
(.text+0xe60): multiple definition of `init_module'
drivers/staging/batman-adv/built-in.o:(.text+0x400): first defined here

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
[sven.eckelmann@gmx.de: Mark module init and exit functions as static]
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent a1a38cad

drivers/staging/batman-adv/main.c

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,7 @@ static struct packet_type batman_adv_packet_type __read_mostly = {

	struct workqueue_struct *bat_event_workqueue;		struct workqueue_struct *bat_event_workqueue;

	int init_module(void)		static int __init batman_init(void)
	{		{
	int retval;		int retval;

	@@ -131,7 +131,7 @@ end:
	return -ENOMEM;		return -ENOMEM;
	}		}

	void cleanup_module(void)		static void __exit batman_exit(void)
	{		{
	deactivate_module();		deactivate_module();

	@@ -273,6 +273,9 @@ int is_mcast(uint8_t *addr)
	return *addr & 0x01;		return *addr & 0x01;
	}		}

			module_init(batman_init);
			module_exit(batman_exit);

	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");

	MODULE_AUTHOR(DRIVER_AUTHOR);		MODULE_AUTHOR(DRIVER_AUTHOR);