diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-22 13:15:42 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-22 15:02:06 -0500 |
commit | 460da45d92f19adda1b79910652d5a23c65dd272 (patch) | |
tree | d38e6f0d4c9975deb539d4a6289de43616457cd9 | |
parent | 2fb9b3d4e5d720d4033461519af0d3f789924015 (diff) |
Bluetooth: Remove lock from inquiry_cache
It was never used, so removing it.
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
-rw-r--r-- | include/net/bluetooth/hci_core.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 4ff08d61eea..37d7cb8be48 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -50,7 +50,6 @@ struct inquiry_entry { | |||
50 | }; | 50 | }; |
51 | 51 | ||
52 | struct inquiry_cache { | 52 | struct inquiry_cache { |
53 | spinlock_t lock; | ||
54 | __u32 timestamp; | 53 | __u32 timestamp; |
55 | struct inquiry_entry *list; | 54 | struct inquiry_entry *list; |
56 | }; | 55 | }; |
@@ -349,15 +348,9 @@ extern int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb); | |||
349 | #define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */ | 348 | #define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */ |
350 | #define INQUIRY_ENTRY_AGE_MAX (HZ*60) /* 60 seconds */ | 349 | #define INQUIRY_ENTRY_AGE_MAX (HZ*60) /* 60 seconds */ |
351 | 350 | ||
352 | #define inquiry_cache_lock(c) spin_lock(&c->lock) | ||
353 | #define inquiry_cache_unlock(c) spin_unlock(&c->lock) | ||
354 | #define inquiry_cache_lock_bh(c) spin_lock_bh(&c->lock) | ||
355 | #define inquiry_cache_unlock_bh(c) spin_unlock_bh(&c->lock) | ||
356 | |||
357 | static inline void inquiry_cache_init(struct hci_dev *hdev) | 351 | static inline void inquiry_cache_init(struct hci_dev *hdev) |
358 | { | 352 | { |
359 | struct inquiry_cache *c = &hdev->inq_cache; | 353 | struct inquiry_cache *c = &hdev->inq_cache; |
360 | spin_lock_init(&c->lock); | ||
361 | c->list = NULL; | 354 | c->list = NULL; |
362 | } | 355 | } |
363 | 356 | ||