Skip to content

Commit

Permalink
Staging: batman-adv: don't use default init_module/cleanup_module fun…
Browse files Browse the repository at this point in the history
…ction 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>
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Jul 22, 2010
1 parent a1a38ca commit c0cad1e
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/staging/batman-adv/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -131,7 +131,7 @@ int init_module(void)
return -ENOMEM;
}

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

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

module_init(batman_init);
module_exit(batman_exit);

MODULE_LICENSE("GPL");

MODULE_AUTHOR(DRIVER_AUTHOR);
Expand Down

0 comments on commit c0cad1e

Please sign in to comment.