Bluetooth: discard bt_sock_unregister() errors

After we successfully registered a socket via bt_sock_register() there is
no reason to ever check the return code of bt_sock_unregister(). If
bt_sock_unregister() fails, it means the socket _is_ already unregistered
so we have what we want, don't we?

Also, to get bt_sock_unregister() to fail, another part of the kernel has
to unregister _our_ socket. This is sooo _wrong_ that it will break way
earlier than when we unregister our socket.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index e7154a58465f6b9136f527ab868024464d961564..5b1c04e2882188c73031415144a8130995b27a3d 100644 (file)
--- a/net/bluetooth/bnep/sock.c
+++ b/net/bluetooth/bnep/sock.c
@@ -253,8 +253,6 @@ error:
 void __exit bnep_sock_cleanup(void)
 {
        bt_procfs_cleanup(&init_net, "bnep");
-       if (bt_sock_unregister(BTPROTO_BNEP) < 0)
-               BT_ERR("Can't unregister BNEP socket");
-
+       bt_sock_unregister(BTPROTO_BNEP);
        proto_unregister(&bnep_proto);
 }

diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c
index 1c57482112b6e5c1eebfa30ce1ac84375db737dd..58d9edebab4b02d6cfa242d5f450fc6a2a4060cb 100644 (file)
--- a/net/bluetooth/cmtp/sock.c
+++ b/net/bluetooth/cmtp/sock.c
@@ -264,8 +264,6 @@ error:
 void cmtp_cleanup_sockets(void)
 {
        bt_procfs_cleanup(&init_net, "cmtp");
-       if (bt_sock_unregister(BTPROTO_CMTP) < 0)
-               BT_ERR("Can't unregister CMTP socket");
-
+       bt_sock_unregister(BTPROTO_CMTP);
        proto_unregister(&cmtp_proto);
 }

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 6a93614f2c49c4a7c498f20656ed2a0560de7c33..ec044d31f79cdad9e300a8f555377e7d3acf41d8 100644 (file)
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -1121,8 +1121,6 @@ error:
 void hci_sock_cleanup(void)
 {
        bt_procfs_cleanup(&init_net, "hci");
-       if (bt_sock_unregister(BTPROTO_HCI) < 0)
-               BT_ERR("HCI socket unregistration failed");
-
+       bt_sock_unregister(BTPROTO_HCI);
        proto_unregister(&hci_sk_proto);
 }

diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
index 82a829d90b0f4a8f60013653bf0eed34237cb5b0..5d0f1ca0a314660698e67d9c2d58d26dcc269ffa 100644 (file)
--- a/net/bluetooth/hidp/sock.c
+++ b/net/bluetooth/hidp/sock.c
@@ -304,8 +304,6 @@ error:
 void __exit hidp_cleanup_sockets(void)
 {
        bt_procfs_cleanup(&init_net, "hidp");
-       if (bt_sock_unregister(BTPROTO_HIDP) < 0)
-               BT_ERR("Can't unregister HIDP socket");
-
+       bt_sock_unregister(BTPROTO_HIDP);
        proto_unregister(&hidp_proto);
 }

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 1bcfb8422fdcf55096e9b4131e07eab63d5c365c..7f9704993b74044ec1c93e3308c7172393bb062d 100644 (file)
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -1312,8 +1312,6 @@ error:
 void l2cap_cleanup_sockets(void)
 {
        bt_procfs_cleanup(&init_net, "l2cap");
-       if (bt_sock_unregister(BTPROTO_L2CAP) < 0)
-               BT_ERR("L2CAP socket unregistration failed");
-
+       bt_sock_unregister(BTPROTO_L2CAP);
        proto_unregister(&l2cap_proto);
 }

diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index c23bae86263b6e98a21a8f69ae45190b827b2376..3786ddc45152b14d17495e8fe7f15b143d6a178e 100644 (file)
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -1065,8 +1065,7 @@ void __exit rfcomm_cleanup_sockets(void)
 
        debugfs_remove(rfcomm_sock_debugfs);
 
-       if (bt_sock_unregister(BTPROTO_RFCOMM) < 0)
-               BT_ERR("RFCOMM socket layer unregistration failed");
+       bt_sock_unregister(BTPROTO_RFCOMM);
 
        proto_unregister(&rfcomm_proto);
 }

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 79d87d8d4f514f5529b57f1b89119a735d068f69..0a3aeb7e0aa69345690f6df13f8cb3c09adeab4f 100644 (file)
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -1111,8 +1111,7 @@ void __exit sco_exit(void)
 
        debugfs_remove(sco_debugfs);
 
-       if (bt_sock_unregister(BTPROTO_SCO) < 0)
-               BT_ERR("SCO socket unregistration failed");
+       bt_sock_unregister(BTPROTO_SCO);
 
        proto_unregister(&sco_proto);
 }