From: Johan Hedberg <johan.hedberg@intel.com>
Date: Sat, 26 Jan 2013 22:31:28 +0000 (+0200)
Subject: Bluetooth: Simplify UUIDs clearing code
X-Git-Tag: accepted/tizen/common/20141203.182822~2855^2~31^2^2~102^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4821002ce2baa130666c2d777e0ed30bee6c7702;p=platform%2Fkernel%2Flinux-arm64.git

Bluetooth: Simplify UUIDs clearing code

The code for clearing the UUIDs list can be simplified by using
list_for_each_entry_safe instead of list_for_each_safe.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index d13ce99..22e77a7 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1183,14 +1183,10 @@ static void hci_discov_off(struct work_struct *work)
 
 int hci_uuids_clear(struct hci_dev *hdev)
 {
-	struct list_head *p, *n;
-
-	list_for_each_safe(p, n, &hdev->uuids) {
-		struct bt_uuid *uuid;
+	struct bt_uuid *uuid, *tmp;
 
-		uuid = list_entry(p, struct bt_uuid, list);
-
-		list_del(p);
+	list_for_each_entry_safe(uuid, tmp, &hdev->uuids, list) {
+		list_del(&uuid->list);
 		kfree(uuid);
 	}