aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2015-02-14 16:36:04 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2015-02-15 03:14:49 -0500
commit59d4d0863e2e87cbdc089bd446754d64a010d29c (patch)
tree767ed79828895dd122dc537833ac1a420f55d2f5
parent055540a176c48b33dbb4d756e80e1e301ef86a42 (diff)
Bluetooth: Make amp_mgr_list and amp_mgr_list_lock static
There is no reason to have amp_mgr_list and amp_mgr_list_lock exported from a2mp.c and thus make both of them static. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-rw-r--r--net/bluetooth/a2mp.c4
-rw-r--r--net/bluetooth/a2mp.h3
2 files changed, 2 insertions, 5 deletions
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index 6baa78a4e76c..e4f179117ae2 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -22,8 +22,8 @@
22#define A2MP_FEAT_EXT 0x8000 22#define A2MP_FEAT_EXT 0x8000
23 23
24/* Global AMP Manager list */ 24/* Global AMP Manager list */
25LIST_HEAD(amp_mgr_list); 25static LIST_HEAD(amp_mgr_list);
26DEFINE_MUTEX(amp_mgr_list_lock); 26static DEFINE_MUTEX(amp_mgr_list_lock);
27 27
28/* A2MP build & send command helper functions */ 28/* A2MP build & send command helper functions */
29static struct a2mp_cmd *__a2mp_build(u8 code, u8 ident, u16 len, void *data) 29static struct a2mp_cmd *__a2mp_build(u8 code, u8 ident, u16 len, void *data)
diff --git a/net/bluetooth/a2mp.h b/net/bluetooth/a2mp.h
index 5c0a36b7ecc4..883266602cbc 100644
--- a/net/bluetooth/a2mp.h
+++ b/net/bluetooth/a2mp.h
@@ -129,9 +129,6 @@ struct a2mp_physlink_rsp {
129#define A2MP_STATUS_PHYS_LINK_EXISTS 0x05 129#define A2MP_STATUS_PHYS_LINK_EXISTS 0x05
130#define A2MP_STATUS_SECURITY_VIOLATION 0x06 130#define A2MP_STATUS_SECURITY_VIOLATION 0x06
131 131
132extern struct list_head amp_mgr_list;
133extern struct mutex amp_mgr_list_lock;
134
135struct amp_mgr *amp_mgr_get(struct amp_mgr *mgr); 132struct amp_mgr *amp_mgr_get(struct amp_mgr *mgr);
136int amp_mgr_put(struct amp_mgr *mgr); 133int amp_mgr_put(struct amp_mgr *mgr);
137u8 __next_ident(struct amp_mgr *mgr); 134u8 __next_ident(struct amp_mgr *mgr);