Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8035ded4 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Gustavo Padovan
Browse files

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: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 457f4850

net/bluetooth/bnep/core.c

+4 −9
Original line number Diff line number Diff line
@@ -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))) {

net/bluetooth/cmtp/core.c

+4 −9
Original line number Diff line number Diff line
@@ -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))) {

net/bluetooth/hci_conn.c

+4 −10
Original line number Diff line number Diff line
@@ -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;

net/bluetooth/hci_core.c

+12 −34
Original line number Diff line number Diff line
@@ -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);

			break;
@@ -794,9 +792,9 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg) 


int hci_get_dev_list(void __user *arg)

{

	struct hci_dev *hdev;

	struct hci_dev_list_req *dl;

	struct hci_dev_req *dr;

	struct list_head *p;

	int n = 0, size, err;

	__u16 dev_num;
@@ -815,11 +813,7 @@ int hci_get_dev_list(void __user *arg) 
	dr = dl->dev_req;



	read_lock_bh(&hci_dev_list_lock);

	list_for_each(p, &hci_dev_list) {

		struct hci_dev *hdev;



		hdev = list_entry(p, struct hci_dev, list);



	list_for_each_entry(hdev, &hci_dev_list, list) {

		hci_del_off_timer(hdev);



		if (!test_bit(HCI_MGMT, &hdev->flags))
@@ -1008,16 +1002,11 @@ int hci_link_keys_clear(struct hci_dev *hdev) 


struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr)

{

	struct list_head *p;



	list_for_each(p, &hdev->link_keys) {

	struct link_key *k;



		k = list_entry(p, struct link_key, list);



	list_for_each_entry(k, &hdev->link_keys, list)

		if (bacmp(bdaddr, &k->bdaddr) == 0)

			return k;

	}



	return NULL;

}
@@ -1280,16 +1269,11 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *hash, 
struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev,

						bdaddr_t *bdaddr)

{

	struct list_head *p;



	list_for_each(p, &hdev->blacklist) {

	struct bdaddr_list *b;



		b = list_entry(p, struct bdaddr_list, list);



	list_for_each_entry(b, &hdev->blacklist, list)

		if (bacmp(bdaddr, &b->bdaddr) == 0)

			return b;

	}



	return NULL;

}
@@ -2031,16 +2015,12 @@ EXPORT_SYMBOL(hci_send_sco); 
static inline struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type, int *quote)

{

	struct hci_conn_hash *h = &hdev->conn_hash;

	struct hci_conn *conn = NULL;

	struct hci_conn *conn = NULL, *c;

	int num = 0, min = ~0;

	struct list_head *p;



	/* We don't have to lock device here. Connections are always

	 * added and removed with TX task disabled. */

	list_for_each(p, &h->list) {

		struct hci_conn *c;

		c = list_entry(p, struct hci_conn, list);



	list_for_each_entry(c, &h->list, list) {

		if (c->type != type || skb_queue_empty(&c->data_q))

			continue;
@@ -2089,14 +2069,12 @@ static inline struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type, int 
static inline void hci_link_tx_to(struct hci_dev *hdev, __u8 type)

{

	struct hci_conn_hash *h = &hdev->conn_hash;

	struct list_head *p;

	struct hci_conn *c;



	BT_ERR("%s link tx timeout", hdev->name);



	/* Kill stalled connections */

	list_for_each(p, &h->list) {

		c = list_entry(p, struct hci_conn, list);

	list_for_each_entry(c, &h->list, list) {

		if (c->type == type && c->sent) {

			BT_ERR("%s killing stalled connection %s",

				hdev->name, batostr(&c->dst));

net/bluetooth/hci_sysfs.c

+4 −14
Original line number Diff line number Diff line
@@ -435,17 +435,12 @@ static const struct file_operations inquiry_cache_fops = { 
static int blacklist_show(struct seq_file *f, void *p)

{

	struct hci_dev *hdev = f->private;

	struct list_head *l;



	hci_dev_lock_bh(hdev);



	list_for_each(l, &hdev->blacklist) {

	struct bdaddr_list *b;



		b = list_entry(l, struct bdaddr_list, list);

	hci_dev_lock_bh(hdev);



	list_for_each_entry(b, &hdev->blacklist, list)

		seq_printf(f, "%s\n", batostr(&b->bdaddr));

	}



	hci_dev_unlock_bh(hdev);
@@ -484,17 +479,12 @@ static void print_bt_uuid(struct seq_file *f, u8 *uuid) 
static int uuids_show(struct seq_file *f, void *p)

{

	struct hci_dev *hdev = f->private;

	struct list_head *l;



	hci_dev_lock_bh(hdev);



	list_for_each(l, &hdev->uuids) {

	struct bt_uuid *uuid;



		uuid = list_entry(l, struct bt_uuid, list);

	hci_dev_lock_bh(hdev);



	list_for_each_entry(uuid, &hdev->uuids, list)

		print_bt_uuid(f, uuid->uuid);

	}



	hci_dev_unlock_bh(hdev);