batman-adv: use list_for_each_entry_safe

Use list_for_each_entry_safe() instead of list_for_each_safe() to
simplify the code.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Acked-by: Antonio Quartulli <a@unstable.cc>
Reviewed-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>

diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index 14d0013b387ed4cfbf797884857414ae8bf0e7f7..8a5889d134bc1142c22fdeec47f379f890c7dfb6 100644 (file)
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -104,25 +104,21 @@ static int batadv_socket_open(struct inode *inode, struct file *file)
 
 static int batadv_socket_release(struct inode *inode, struct file *file)
 {
-       struct batadv_socket_client *socket_client = file->private_data;
-       struct batadv_socket_packet *socket_packet;
-       struct list_head *list_pos, *list_pos_tmp;
+       struct batadv_socket_client *client = file->private_data;
+       struct batadv_socket_packet *packet, *tmp;
 
-       spin_lock_bh(&socket_client->lock);
+       spin_lock_bh(&client->lock);
 
        /* for all packets in the queue ... */
-       list_for_each_safe(list_pos, list_pos_tmp, &socket_client->queue_list) {
-               socket_packet = list_entry(list_pos,
-                                          struct batadv_socket_packet, list);
-
-               list_del(list_pos);
-               kfree(socket_packet);
+       list_for_each_entry_safe(packet, tmp, &client->queue_list, list) {
+               list_del(&packet->list);
+               kfree(packet);
        }
 
-       batadv_socket_client_hash[socket_client->index] = NULL;
-       spin_unlock_bh(&socket_client->lock);
+       batadv_socket_client_hash[client->index] = NULL;
+       spin_unlock_bh(&client->lock);
 
-       kfree(socket_client);
+       kfree(client);
        module_put(THIS_MODULE);
 
        return 0;