Initialize Bluetooth core using subsys_initcall().

net/bluetooth/af_bluetooth.c

@@ -356,7 +356,7 @@ static void __exit bluez_cleanup(void)
 	remove_proc_entry("bluetooth", NULL);
 }
 
-module_init(bluez_init);
+subsys_initcall(bluez_init);
 module_exit(bluez_cleanup);
 
 MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>");

net/socket.c

@@ -1684,10 +1684,6 @@ extern void sk_init(void);
 extern void wanrouter_init(void);
 #endif
 
-#ifdef CONFIG_BLUEZ
-extern void bluez_init(void);
-#endif
-
 void __init sock_init(void)
 {
 	int i;
@@ -1748,10 +1744,6 @@ void __init sock_init(void)
 #ifdef CONFIG_NETFILTER
 	netfilter_init();
 #endif
-
-#ifdef CONFIG_BLUEZ
-	bluez_init();
-#endif
 }
 
 int socket_get_info(char *buffer, char **start, off_t offset, int length)