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>

2 files changed, 12 insertions, 22 deletions

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 38b618c96de6..3d35eba6d0cb 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -377,13 +377,11 @@ static void rfcomm_dlc_unlink(struct rfcomm_dlc *d)
 static struct rfcomm_dlc *rfcomm_dlc_get(struct rfcomm_session *s, u8 dlci)
 {
         struct rfcomm_dlc *d;
-        struct list_head *p;
 
-        list_for_each(p, &s->dlcs) {
-                d = list_entry(p, struct rfcomm_dlc, list);
+        list_for_each_entry(d, &s->dlcs, list)
                 if (d->dlci == dlci)
                         return d;
-        }
+
         return NULL;
 }
 
@@ -2115,15 +2113,13 @@ static struct hci_cb rfcomm_cb = {
 static int rfcomm_dlc_debugfs_show(struct seq_file *f, void *x)
 {
         struct rfcomm_session *s;
-        struct list_head *pp, *p;
 
         rfcomm_lock();
 
-        list_for_each(p, &session_list) {
-                s = list_entry(p, struct rfcomm_session, list);
-                list_for_each(pp, &s->dlcs) {
+        list_for_each_entry(s, &session_list, list) {
+                struct rfcomm_dlc *d;
+                list_for_each_entry(d, &s->dlcs, list) {
                         struct sock *sk = s->sock->sk;
-                        struct rfcomm_dlc *d = list_entry(pp, struct rfcomm_dlc, list);
 
                         seq_printf(f, "%s %s %ld %d %d %d %d\n",
                                                 batostr(&bt_sk(sk)->src),
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 947f1b3afd15..fa8f4de53b99 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -134,13 +134,10 @@ static inline void rfcomm_dev_put(struct rfcomm_dev *dev)
 static struct rfcomm_dev *__rfcomm_dev_get(int id)
 {
         struct rfcomm_dev *dev;
-        struct list_head  *p;
 
-        list_for_each(p, &rfcomm_dev_list) {
-                dev = list_entry(p, struct rfcomm_dev, list);
+        list_for_each_entry(dev, &rfcomm_dev_list, list)
                 if (dev->id == id)
                         return dev;
-        }
 
         return NULL;
 }
@@ -198,7 +195,7 @@ static DEVICE_ATTR(channel, S_IRUGO, show_channel, NULL);
 
 static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
 {
-        struct rfcomm_dev *dev;
+        struct rfcomm_dev *dev, *entry;
         struct list_head *head = &rfcomm_dev_list, *p;
         int err = 0;
 
@@ -213,8 +210,8 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
         if (req->dev_id < 0) {
                 dev->id = 0;
 
-                list_for_each(p, &rfcomm_dev_list) {
-                        if (list_entry(p, struct rfcomm_dev, list)->id != dev->id)
+                list_for_each_entry(entry, &rfcomm_dev_list, list) {
+                        if (entry->id != dev->id)
                                 break;
 
                         dev->id++;
@@ -223,9 +220,7 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
         } else {
                 dev->id = req->dev_id;
 
-                list_for_each(p, &rfcomm_dev_list) {
-                        struct rfcomm_dev *entry = list_entry(p, struct rfcomm_dev, list);
-
+                list_for_each_entry(entry, &rfcomm_dev_list, list) {
                         if (entry->id == dev->id) {
                                 err = -EADDRINUSE;
                                 goto out;
@@ -456,9 +451,9 @@ static int rfcomm_release_dev(void __user *arg)
 
 static int rfcomm_get_dev_list(void __user *arg)
 {
+        struct rfcomm_dev *dev;
         struct rfcomm_dev_list_req *dl;
         struct rfcomm_dev_info *di;
-        struct list_head *p;
         int n = 0, size, err;
         u16 dev_num;
 
@@ -480,8 +475,7 @@ static int rfcomm_get_dev_list(void __user *arg)
 
         read_lock_bh(&rfcomm_dev_lock);
 
-        list_for_each(p, &rfcomm_dev_list) {
-                struct rfcomm_dev *dev = list_entry(p, struct rfcomm_dev, list);
+        list_for_each_entry(dev, &rfcomm_dev_list, list) {
                 if (test_bit(RFCOMM_TTY_RELEASED, &dev->flags))
                         continue;
                 (di + n)->id      = dev->id;