aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/a2mp.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2015-02-14 16:36:05 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2015-02-15 03:14:51 -0500
commit469cd4c5a6ace7c6285d8708709d0002b8984d47 (patch)
tree441000867b0cf9335731bfef7c880599d5b1ce77 /net/bluetooth/a2mp.c
parent59d4d0863e2e87cbdc089bd446754d64a010d29c (diff)
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: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/a2mp.c')
-rw-r--r--net/bluetooth/a2mp.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index e4f179117ae2..6bba3044dc7f 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -77,6 +77,23 @@ u8 __next_ident(struct amp_mgr *mgr)
77 return mgr->ident; 77 return mgr->ident;
78} 78}
79 79
80static struct amp_mgr *amp_mgr_lookup_by_state(u8 state)
81{
82 struct amp_mgr *mgr;
83
84 mutex_lock(&amp_mgr_list_lock);
85 list_for_each_entry(mgr, &amp_mgr_list, list) {
86 if (test_and_clear_bit(state, &mgr->state)) {
87 amp_mgr_get(mgr);
88 mutex_unlock(&amp_mgr_list_lock);
89 return mgr;
90 }
91 }
92 mutex_unlock(&amp_mgr_list_lock);
93
94 return NULL;
95}
96
80/* hci_dev_list shall be locked */ 97/* hci_dev_list shall be locked */
81static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl) 98static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl)
82{ 99{
@@ -862,23 +879,6 @@ struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn,
862 return mgr->a2mp_chan; 879 return mgr->a2mp_chan;
863} 880}
864 881
865struct amp_mgr *amp_mgr_lookup_by_state(u8 state)
866{
867 struct amp_mgr *mgr;
868
869 mutex_lock(&amp_mgr_list_lock);
870 list_for_each_entry(mgr, &amp_mgr_list, list) {
871 if (test_and_clear_bit(state, &mgr->state)) {
872 amp_mgr_get(mgr);
873 mutex_unlock(&amp_mgr_list_lock);
874 return mgr;
875 }
876 }
877 mutex_unlock(&amp_mgr_list_lock);
878
879 return NULL;
880}
881
882void a2mp_send_getinfo_rsp(struct hci_dev *hdev) 882void a2mp_send_getinfo_rsp(struct hci_dev *hdev)
883{ 883{
884 struct amp_mgr *mgr; 884 struct amp_mgr *mgr;