Bluetooth: replace list_for_each with list_for_each_entry whenever possible

When all items in the list have the same type there is no much of a point
to use list_for_each except if you want to use the list pointer itself.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

9 files changed, 51 insertions, 120 deletions

diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 91bcd3a961ec..a6cd856046ab 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -65,15 +65,13 @@ static DECLARE_RWSEM(bnep_session_sem);
 static struct bnep_session *__bnep_get_session(u8 *dst)
 {
         struct bnep_session *s;
-        struct list_head *p;
 
         BT_DBG("");
 
-        list_for_each(p, &bnep_session_list) {
-                s = list_entry(p, struct bnep_session, list);
+        list_for_each_entry(s, &bnep_session_list, list)
                 if (!compare_ether_addr(dst, s->eh.h_source))
                         return s;
-        }
+
         return NULL;
 }
 
@@ -667,17 +665,14 @@ static void __bnep_copy_ci(struct bnep_conninfo *ci, struct bnep_session *s)
 
 int bnep_get_connlist(struct bnep_connlist_req *req)
 {
-        struct list_head *p;
+        struct bnep_session *s;
         int err = 0, n = 0;
 
         down_read(&bnep_session_sem);
 
-        list_for_each(p, &bnep_session_list) {
-                struct bnep_session *s;
+        list_for_each_entry(s, &bnep_session_list, list) {
                 struct bnep_conninfo ci;
 
-                s = list_entry(p, struct bnep_session, list);
-
                 __bnep_copy_ci(&ci, s);
 
                 if (copy_to_user(req->ci, &ci, sizeof(ci))) {
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index 7d00ddf9e9dc..9e8940b24bba 100644
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -53,15 +53,13 @@ static LIST_HEAD(cmtp_session_list);
 static struct cmtp_session *__cmtp_get_session(bdaddr_t *bdaddr)
 {
         struct cmtp_session *session;
-        struct list_head *p;
 
         BT_DBG("");
 
-        list_for_each(p, &cmtp_session_list) {
-                session = list_entry(p, struct cmtp_session, list);
+        list_for_each_entry(session, &cmtp_session_list, list)
                 if (!bacmp(bdaddr, &session->bdaddr))
                         return session;
-        }
+
         return NULL;
 }
 
@@ -431,19 +429,16 @@ int cmtp_del_connection(struct cmtp_conndel_req *req)
 
 int cmtp_get_connlist(struct cmtp_connlist_req *req)
 {
-        struct list_head *p;
+        struct cmtp_session *session;
         int err = 0, n = 0;
 
         BT_DBG("");
 
         down_read(&cmtp_session_sem);
 
-        list_for_each(p, &cmtp_session_list) {
-                struct cmtp_session *session;
+        list_for_each_entry(session, &cmtp_session_list, list) {
                 struct cmtp_conninfo ci;
 
-                session = list_entry(p, struct cmtp_session, list);
-
                 __cmtp_copy_session(session, &ci);
 
                 if (copy_to_user(req->ci, &ci, sizeof(ci))) {
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index c1c597e3e198..6e98ff3da2a4 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -453,16 +453,13 @@ int hci_conn_del(struct hci_conn *conn)
 struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src)
 {
         int use_src = bacmp(src, BDADDR_ANY);
-        struct hci_dev *hdev = NULL;
-        struct list_head *p;
+        struct hci_dev *hdev = NULL, *d;
 
         BT_DBG("%s -> %s", batostr(src), batostr(dst));
 
         read_lock_bh(&hci_dev_list_lock);
 
-        list_for_each(p, &hci_dev_list) {
-                struct hci_dev *d = list_entry(p, struct hci_dev, list);
-
+        list_for_each_entry(d, &hci_dev_list, list) {
                 if (!test_bit(HCI_UP, &d->flags) || test_bit(HCI_RAW, &d->flags))
                         continue;
 
@@ -855,10 +852,10 @@ EXPORT_SYMBOL(hci_conn_put_device);
 
 int hci_get_conn_list(void __user *arg)
 {
+        register struct hci_conn *c;
         struct hci_conn_list_req req, *cl;
         struct hci_conn_info *ci;
         struct hci_dev *hdev;
-        struct list_head *p;
         int n = 0, size, err;
 
         if (copy_from_user(&req, arg, sizeof(req)))
@@ -882,10 +879,7 @@ int hci_get_conn_list(void __user *arg)
         ci = cl->conn_info;
 
         hci_dev_lock_bh(hdev);
-        list_for_each(p, &hdev->conn_hash.list) {
-                register struct hci_conn *c;
-                c = list_entry(p, struct hci_conn, list);
-
+        list_for_each_entry(c, &hdev->conn_hash.list, list) {
                 bacpy(&(ci + n)->bdaddr, &c->dst);
                 (ci + n)->handle = c->handle;
                 (ci + n)->type  = c->type;
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 557ff90331b9..f04f2eca2028 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -319,8 +319,7 @@ static void hci_linkpol_req(struct hci_dev *hdev, unsigned long opt)
  * Device is held on return. */
 struct hci_dev *hci_dev_get(int index)
 {
-        struct hci_dev *hdev = NULL;
-        struct list_head *p;
+        struct hci_dev *hdev = NULL, *d;
 
         BT_DBG("%d", index);
 
@@ -328,8 +327,7 @@ struct hci_dev *hci_dev_get(int index)
                 return NULL;
 
         read_lock(&hci_dev_list_lock);
-        list_for_each(p, &hci_dev_list) {
-                struct hci_dev *d = list_entry(p, struct hci_dev, list);
+        list_for_each_entry(d, &hci_dev_list, list) {
                 if (d->id == index) {
                         hdev = hci_dev_hold(d);