Bluetooth: Improve *_get() functions to return the object type

It's natural to have *_get() functions that increment the reference
count of an object to return the object type itself. This way it's
simple to make a copy of the object pointer and increase the reference
count in a single step. This patch updates two such get() functions,
namely hci_conn_get() and l2cap_conn_get(), and updates the users to
take advantage of the new API.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 4 insertions, 6 deletions

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 6c7ecf116e74..1b7d605706aa 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -915,7 +915,7 @@ static int hidp_session_new(struct hidp_session **out, const bdaddr_t *bdaddr,
 
         /* connection management */
         bacpy(&session->bdaddr, bdaddr);
-        session->conn = conn;
+        session->conn = l2cap_conn_get(conn);
         session->user.probe = hidp_session_probe;
         session->user.remove = hidp_session_remove;
         session->ctrl_sock = ctrl_sock;
@@ -941,13 +941,13 @@ static int hidp_session_new(struct hidp_session **out, const bdaddr_t *bdaddr,
         if (ret)
                 goto err_free;
 
-        l2cap_conn_get(session->conn);
         get_file(session->intr_sock->file);
         get_file(session->ctrl_sock->file);
         *out = session;
         return 0;
 
 err_free:
+        l2cap_conn_put(session->conn);
         kfree(session);
         return ret;
 }
@@ -1327,10 +1327,8 @@ int hidp_connection_add(struct hidp_connadd_req *req,
 
         conn = NULL;
         l2cap_chan_lock(chan);
-        if (chan->conn) {
-                l2cap_conn_get(chan->conn);
-                conn = chan->conn;
-        }
+        if (chan->conn)
+                conn = l2cap_conn_get(chan->conn);
         l2cap_chan_unlock(chan);
 
         if (!conn)