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

Commit 469cd4c5 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Make amp_mgr_lookup_by_state function static 



The amp_mgr_lookup_by_state function does not need to be exported. So
just move it to a different location and make it static.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 59d4d086

net/bluetooth/a2mp.c

+17 −17
Original line number Diff line number Diff line
@@ -77,6 +77,23 @@ u8 __next_ident(struct amp_mgr *mgr) 
	return mgr->ident;

}



static struct amp_mgr *amp_mgr_lookup_by_state(u8 state)

{

	struct amp_mgr *mgr;



	mutex_lock(&amp_mgr_list_lock);

	list_for_each_entry(mgr, &amp_mgr_list, list) {

		if (test_and_clear_bit(state, &mgr->state)) {

			amp_mgr_get(mgr);

			mutex_unlock(&amp_mgr_list_lock);

			return mgr;

		}

	}

	mutex_unlock(&amp_mgr_list_lock);



	return NULL;

}



/* hci_dev_list shall be locked */

static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl)

{
@@ -862,23 +879,6 @@ struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn, 
	return mgr->a2mp_chan;

}



struct amp_mgr *amp_mgr_lookup_by_state(u8 state)

{

	struct amp_mgr *mgr;



	mutex_lock(&amp_mgr_list_lock);

	list_for_each_entry(mgr, &amp_mgr_list, list) {

		if (test_and_clear_bit(state, &mgr->state)) {

			amp_mgr_get(mgr);

			mutex_unlock(&amp_mgr_list_lock);

			return mgr;

		}

	}

	mutex_unlock(&amp_mgr_list_lock);



	return NULL;

}



void a2mp_send_getinfo_rsp(struct hci_dev *hdev)

{

	struct amp_mgr *mgr;

net/bluetooth/a2mp.h

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ int amp_mgr_put(struct amp_mgr *mgr); 
u8 __next_ident(struct amp_mgr *mgr);

struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn,

				       struct sk_buff *skb);

struct amp_mgr *amp_mgr_lookup_by_state(u8 state);

void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len, void *data);

void a2mp_discover_amp(struct l2cap_chan *chan);

void a2mp_send_getinfo_rsp(struct hci_dev *hdev);