diff options
-rw-r--r-- | include/net/bluetooth/bluetooth.h | 2 | ||||
-rw-r--r-- | net/bluetooth/af_bluetooth.c | 4 | ||||
-rw-r--r-- | net/bluetooth/bnep/sock.c | 2 | ||||
-rw-r--r-- | net/bluetooth/cmtp/sock.c | 2 | ||||
-rw-r--r-- | net/bluetooth/hci_sock.c | 2 | ||||
-rw-r--r-- | net/bluetooth/hidp/sock.c | 2 | ||||
-rw-r--r-- | net/bluetooth/l2cap_sock.c | 2 | ||||
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 2 | ||||
-rw-r--r-- | net/bluetooth/sco.c | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 9531beee09b5..946c7772b137 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h | |||
@@ -319,7 +319,7 @@ extern void hci_sock_cleanup(void); | |||
319 | extern int bt_sysfs_init(void); | 319 | extern int bt_sysfs_init(void); |
320 | extern void bt_sysfs_cleanup(void); | 320 | extern void bt_sysfs_cleanup(void); |
321 | 321 | ||
322 | extern int bt_procfs_init(struct module* module, struct net *net, const char *name, | 322 | extern int bt_procfs_init(struct net *net, const char *name, |
323 | struct bt_sock_list* sk_list, | 323 | struct bt_sock_list* sk_list, |
324 | int (* seq_show)(struct seq_file *, void *)); | 324 | int (* seq_show)(struct seq_file *, void *)); |
325 | extern void bt_procfs_cleanup(struct net *net, const char *name); | 325 | extern void bt_procfs_cleanup(struct net *net, const char *name); |
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 8ab94c6f6f3f..68e6fefb3655 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c | |||
@@ -634,7 +634,7 @@ static const struct file_operations bt_fops = { | |||
634 | .release = seq_release_private | 634 | .release = seq_release_private |
635 | }; | 635 | }; |
636 | 636 | ||
637 | int bt_procfs_init(struct module* module, struct net *net, const char *name, | 637 | int bt_procfs_init(struct net *net, const char *name, |
638 | struct bt_sock_list* sk_list, | 638 | struct bt_sock_list* sk_list, |
639 | int (* seq_show)(struct seq_file *, void *)) | 639 | int (* seq_show)(struct seq_file *, void *)) |
640 | { | 640 | { |
@@ -656,7 +656,7 @@ void bt_procfs_cleanup(struct net *net, const char *name) | |||
656 | remove_proc_entry(name, net->proc_net); | 656 | remove_proc_entry(name, net->proc_net); |
657 | } | 657 | } |
658 | #else | 658 | #else |
659 | int bt_procfs_init(struct module* module, struct net *net, const char *name, | 659 | int bt_procfs_init(struct net *net, const char *name, |
660 | struct bt_sock_list* sk_list, | 660 | struct bt_sock_list* sk_list, |
661 | int (* seq_show)(struct seq_file *, void *)) | 661 | int (* seq_show)(struct seq_file *, void *)) |
662 | { | 662 | { |
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c index e7154a58465f..d4686fb7e957 100644 --- a/net/bluetooth/bnep/sock.c +++ b/net/bluetooth/bnep/sock.c | |||
@@ -234,7 +234,7 @@ int __init bnep_sock_init(void) | |||
234 | goto error; | 234 | goto error; |
235 | } | 235 | } |
236 | 236 | ||
237 | err = bt_procfs_init(THIS_MODULE, &init_net, "bnep", &bnep_sk_list, NULL); | 237 | err = bt_procfs_init(&init_net, "bnep", &bnep_sk_list, NULL); |
238 | if (err < 0) { | 238 | if (err < 0) { |
239 | BT_ERR("Failed to create BNEP proc file"); | 239 | BT_ERR("Failed to create BNEP proc file"); |
240 | bt_sock_unregister(BTPROTO_BNEP); | 240 | bt_sock_unregister(BTPROTO_BNEP); |
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c index 1c57482112b6..03f26bf85d74 100644 --- a/net/bluetooth/cmtp/sock.c +++ b/net/bluetooth/cmtp/sock.c | |||
@@ -245,7 +245,7 @@ int cmtp_init_sockets(void) | |||
245 | goto error; | 245 | goto error; |
246 | } | 246 | } |
247 | 247 | ||
248 | err = bt_procfs_init(THIS_MODULE, &init_net, "cmtp", &cmtp_sk_list, NULL); | 248 | err = bt_procfs_init(&init_net, "cmtp", &cmtp_sk_list, NULL); |
249 | if (err < 0) { | 249 | if (err < 0) { |
250 | BT_ERR("Failed to create CMTP proc file"); | 250 | BT_ERR("Failed to create CMTP proc file"); |
251 | bt_sock_unregister(BTPROTO_HIDP); | 251 | bt_sock_unregister(BTPROTO_HIDP); |
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 6a93614f2c49..6ad23951c133 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
@@ -1102,7 +1102,7 @@ int __init hci_sock_init(void) | |||
1102 | goto error; | 1102 | goto error; |
1103 | } | 1103 | } |
1104 | 1104 | ||
1105 | err = bt_procfs_init(THIS_MODULE, &init_net, "hci", &hci_sk_list, NULL); | 1105 | err = bt_procfs_init(&init_net, "hci", &hci_sk_list, NULL); |
1106 | if (err < 0) { | 1106 | if (err < 0) { |
1107 | BT_ERR("Failed to create HCI proc file"); | 1107 | BT_ERR("Failed to create HCI proc file"); |
1108 | bt_sock_unregister(BTPROTO_HCI); | 1108 | bt_sock_unregister(BTPROTO_HCI); |
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c index 82a829d90b0f..e7e04d4b9d99 100644 --- a/net/bluetooth/hidp/sock.c +++ b/net/bluetooth/hidp/sock.c | |||
@@ -284,7 +284,7 @@ int __init hidp_init_sockets(void) | |||
284 | goto error; | 284 | goto error; |
285 | } | 285 | } |
286 | 286 | ||
287 | err = bt_procfs_init(THIS_MODULE, &init_net, "hidp", &hidp_sk_list, NULL); | 287 | err = bt_procfs_init(&init_net, "hidp", &hidp_sk_list, NULL); |
288 | if (err < 0) { | 288 | if (err < 0) { |
289 | BT_ERR("Failed to create HIDP proc file"); | 289 | BT_ERR("Failed to create HIDP proc file"); |
290 | bt_sock_unregister(BTPROTO_HIDP); | 290 | bt_sock_unregister(BTPROTO_HIDP); |
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 1bcfb8422fdc..fe15960c02c3 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c | |||
@@ -1292,7 +1292,7 @@ int __init l2cap_init_sockets(void) | |||
1292 | goto error; | 1292 | goto error; |
1293 | } | 1293 | } |
1294 | 1294 | ||
1295 | err = bt_procfs_init(THIS_MODULE, &init_net, "l2cap", &l2cap_sk_list, | 1295 | err = bt_procfs_init(&init_net, "l2cap", &l2cap_sk_list, |
1296 | NULL); | 1296 | NULL); |
1297 | if (err < 0) { | 1297 | if (err < 0) { |
1298 | BT_ERR("Failed to create L2CAP proc file"); | 1298 | BT_ERR("Failed to create L2CAP proc file"); |
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index c23bae86263b..fda3bb4019a3 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
@@ -1036,7 +1036,7 @@ int __init rfcomm_init_sockets(void) | |||
1036 | goto error; | 1036 | goto error; |
1037 | } | 1037 | } |
1038 | 1038 | ||
1039 | err = bt_procfs_init(THIS_MODULE, &init_net, "rfcomm", &rfcomm_sk_list, NULL); | 1039 | err = bt_procfs_init(&init_net, "rfcomm", &rfcomm_sk_list, NULL); |
1040 | if (err < 0) { | 1040 | if (err < 0) { |
1041 | BT_ERR("Failed to create RFCOMM proc file"); | 1041 | BT_ERR("Failed to create RFCOMM proc file"); |
1042 | bt_sock_unregister(BTPROTO_RFCOMM); | 1042 | bt_sock_unregister(BTPROTO_RFCOMM); |
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index fad0302bdb32..7e8dbaf8bc10 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
@@ -1083,7 +1083,7 @@ int __init sco_init(void) | |||
1083 | goto error; | 1083 | goto error; |
1084 | } | 1084 | } |
1085 | 1085 | ||
1086 | err = bt_procfs_init(THIS_MODULE, &init_net, "sco", &sco_sk_list, NULL); | 1086 | err = bt_procfs_init(&init_net, "sco", &sco_sk_list, NULL); |
1087 | if (err < 0) { | 1087 | if (err < 0) { |
1088 | BT_ERR("Failed to create SCO proc file"); | 1088 | BT_ERR("Failed to create SCO proc file"); |
1089 | bt_sock_unregister(BTPROTO_SCO); | 1089 | bt_sock_unregister(BTPROTO_SCO); |