[Bluetooth]

Cleanup and fix __init and __exit functions.
/proc/bluetooth initialization fixes.

net/bluetooth/af_bluetooth.c

@@ -335,7 +335,9 @@ static int __init bt_init(void)
 	BT_INFO("Core ver %s", VERSION);
 
 	proc_bt = proc_mkdir("bluetooth", NULL);
-
+	if (proc_bt)
+		proc_bt->owner = THIS_MODULE;
+	
 	/* Init socket cache */
 	bt_sock_cache = kmem_cache_create("bt_sock",
 			sizeof(struct bt_sock), 0,

net/bluetooth/bnep/core.c

@@ -700,7 +700,7 @@ int bnep_get_conninfo(struct bnep_conninfo *ci)
 	return err;
 }
 
-static int __init bnep_init_module(void)
+static int  __init bnep_init_module(void)
 {	
 	char flt[50] = "";	
 

net/bluetooth/bnep/sock.c

@@ -192,13 +192,13 @@ static struct net_proto_family bnep_sock_family_ops = {
 	.create = bnep_sock_create
 };
 
-int bnep_sock_init(void)
+int __init bnep_sock_init(void)
 {
 	bt_sock_register(BTPROTO_BNEP, &bnep_sock_family_ops);
 	return 0;
 }
 
-int bnep_sock_cleanup(void)
+int __exit bnep_sock_cleanup(void)
 {
 	if (bt_sock_unregister(BTPROTO_BNEP))
 		BT_ERR("Can't unregister BNEP socket");

net/bluetooth/hci_proc.c

@@ -151,13 +151,13 @@ void hci_dev_proc_cleanup(struct hci_dev *hdev)
 	remove_proc_entry(id, proc_bt_hci);
 }
 
-int __init hci_proc_init(void)
+int  __init hci_proc_init(void)
 {
 	proc_bt_hci = proc_mkdir("hci", proc_bt);
         return 0;
 }
 
-void __init hci_proc_cleanup(void)
+void __exit hci_proc_cleanup(void)
 {
 	remove_proc_entry("hci", proc_bt);
 }
@@ -179,7 +179,7 @@ int  __init hci_proc_init(void)
         return 0;
 }
 
-void __init hci_proc_cleanup(void)
+void __exit hci_proc_cleanup(void)
 {
         return;
 }

net/bluetooth/hci_sock.c

@@ -625,7 +625,7 @@ struct notifier_block hci_sock_nblock = {
 	.notifier_call = hci_sock_dev_event
 };
 
-int hci_sock_init(void)
+int __init hci_sock_init(void)
 {
 	if (bt_sock_register(BTPROTO_HCI, &hci_sock_family_ops)) {
 		BT_ERR("HCI socket registration failed");
@@ -639,7 +639,7 @@ int hci_sock_init(void)
 	return 0;
 }
 
-int hci_sock_cleanup(void)
+int __exit hci_sock_cleanup(void)
 {
 	if (bt_sock_unregister(BTPROTO_HCI))
 		BT_ERR("HCI socket unregistration failed");

net/bluetooth/l2cap.c

@@ -2054,28 +2054,29 @@ static struct file_operations l2cap_seq_fops = {
 	.release = seq_release,
 };
 
-static int __init l2cap_proc_init(void)
+static int  __init l2cap_proc_init(void)
 {
         struct proc_dir_entry *p = create_proc_entry("l2cap", S_IRUGO, proc_bt);
         if (!p)
                 return -ENOMEM;
+	p->owner     = THIS_MODULE;
         p->proc_fops = &l2cap_seq_fops;
         return 0;
 }
 
-static void __init l2cap_proc_cleanup(void)
+static void __exit l2cap_proc_cleanup(void)
 {
         remove_proc_entry("l2cap", proc_bt);
 }
 
 #else /* CONFIG_PROC_FS */
 
-static int __init l2cap_proc_init(void)
+static int  __init l2cap_proc_init(void)
 {
         return 0;
 }
 
-static void __init l2cap_proc_cleanup(void)
+static void __exit l2cap_proc_cleanup(void)
 {
         return;
 }
@@ -2139,7 +2140,7 @@ int __init l2cap_init(void)
 	return 0;
 }
 
-void l2cap_cleanup(void)
+void __exit l2cap_cleanup(void)
 {
 	l2cap_proc_cleanup();
 

net/bluetooth/rfcomm/core.c

@@ -1803,19 +1803,22 @@ static struct file_operations rfcomm_seq_fops = {
 	.release = seq_release,
 };
 
-static int __init rfcomm_proc_init(void)
+static int  __init rfcomm_proc_init(void)
 {
         struct proc_dir_entry *p;
 
 	proc_bt_rfcomm = proc_mkdir("rfcomm", proc_bt);
+	if (proc_bt_rfcomm) {
+		proc_bt_rfcomm->owner = THIS_MODULE;
 
-        p = create_proc_entry("dlc", S_IRUGO, proc_bt_rfcomm);
-        if (p)
-        	p->proc_fops = &rfcomm_seq_fops;
+        	p = create_proc_entry("dlc", S_IRUGO, proc_bt_rfcomm);
+		if (p)
+        		p->proc_fops = &rfcomm_seq_fops;
+	}
         return 0;
 }
 
-static void __init rfcomm_proc_cleanup(void)
+static void __exit rfcomm_proc_cleanup(void)
 {
         remove_proc_entry("dlc", proc_bt_rfcomm);
 
@@ -1824,19 +1827,19 @@ static void __init rfcomm_proc_cleanup(void)
 
 #else /* CONFIG_PROC_FS */
 
-static int __init rfcomm_proc_init(void)
+static int  __init rfcomm_proc_init(void)
 {
         return 0;
 }
 
-static void __init rfcomm_proc_cleanup(void)
+static void __exit rfcomm_proc_cleanup(void)
 {
         return;
 }
 #endif /* CONFIG_PROC_FS */
 
 /* ---- Initialization ---- */
-int __init rfcomm_init(void)
+int  __init rfcomm_init(void)
 {
 	kernel_thread(rfcomm_run, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
 
@@ -1853,7 +1856,7 @@ int __init rfcomm_init(void)
 	return 0;
 }
 
-void rfcomm_cleanup(void)
+void __exit rfcomm_cleanup(void)
 {
 	/* Terminate working thread.
 	 * ie. Set terminate flag and wake it up */

net/bluetooth/rfcomm/sock.c

@@ -828,7 +828,7 @@ static struct file_operations rfcomm_seq_fops = {
 	.release = seq_release,
 };
 
-static int __init rfcomm_sock_proc_init(void)
+static int  __init rfcomm_sock_proc_init(void)
 {
         struct proc_dir_entry *p = create_proc_entry("sock", S_IRUGO, proc_bt_rfcomm);
         if (!p)
@@ -837,19 +837,19 @@ static int __init rfcomm_sock_proc_init(void)
         return 0;
 }
 
-static void __init rfcomm_sock_proc_cleanup(void)
+static void __exit rfcomm_sock_proc_cleanup(void)
 {
         remove_proc_entry("sock", proc_bt_rfcomm);
 }
 
 #else /* CONFIG_PROC_FS */
 
-static int __init rfcomm_sock_proc_init(void)
+static int  __init rfcomm_sock_proc_init(void)
 {
         return 0;
 }
 
-static void __init rfcomm_sock_proc_cleanup(void)
+static void __exit rfcomm_sock_proc_cleanup(void)
 {
         return;
 }
@@ -879,7 +879,7 @@ static struct net_proto_family rfcomm_sock_family_ops = {
 	.create		= rfcomm_sock_create
 };
 
-int rfcomm_init_sockets(void)
+int  __init rfcomm_init_sockets(void)
 {
 	int err;
 
@@ -894,7 +894,7 @@ int rfcomm_init_sockets(void)
 	return 0;
 }
 
-void rfcomm_cleanup_sockets(void)
+void __exit rfcomm_cleanup_sockets(void)
 {
 	int err;
 

net/bluetooth/sco.c

@@ -939,28 +939,29 @@ static struct file_operations sco_seq_fops = {
 	.release = seq_release,
 };
 
-static int __init sco_proc_init(void)
+static int  __init sco_proc_init(void)
 {
         struct proc_dir_entry *p = create_proc_entry("sco", S_IRUGO, proc_bt);
         if (!p)
                 return -ENOMEM;
+	p->owner     = THIS_MODULE;
         p->proc_fops = &sco_seq_fops;
         return 0;
 }
 
-static void __init sco_proc_cleanup(void)
+static void __exit sco_proc_cleanup(void)
 {
         remove_proc_entry("sco", proc_bt);
 }
 
 #else /* CONFIG_PROC_FS */
 
-static int __init sco_proc_init(void)
+static int  __init sco_proc_init(void)
 {
         return 0;
 }
 
-static void __init sco_proc_cleanup(void)
+static void __exit sco_proc_cleanup(void)
 {
         return;
 }
@@ -1021,7 +1022,7 @@ int __init sco_init(void)
 	return 0;
 }
 
-void sco_cleanup(void)
+void __exit sco_cleanup(void)
 {
 	int err;