[2/3] Staging: batman-adv: don't use default init_module/cleanup_module function names

Message ID 1279664722-27500-3-git-send-email-sven.eckelmann@gmx.de
State Not Applicable, archived

Commit Message

Sven Eckelmann July 20, 2010, 10:25 p.m. UTC
  From: Randy Dunlap <randy.dunlap@oracle.com>

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>
 drivers/staging/batman-adv/main.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c
index a4d238b..2686019 100644
--- a/drivers/staging/batman-adv/main.c
+++ b/drivers/staging/batman-adv/main.c
@@ -59,7 +59,7 @@  static struct packet_type batman_adv_packet_type __read_mostly = {
 struct workqueue_struct *bat_event_workqueue;
-int init_module(void)
+static int __init batman_init(void)
 	int retval;
@@ -131,7 +131,7 @@  end:
 	return -ENOMEM;
-void cleanup_module(void)
+static void __exit batman_exit(void)
@@ -273,6 +273,9 @@  int is_mcast(uint8_t *addr)
 	return *addr & 0x01;