OSDN Git Service

Bluetooth: Remove lock from inquiry_cache
authorGustavo F. Padovan <padovan@profusion.mobi>
Thu, 22 Dec 2011 18:15:42 +0000 (16:15 -0200)
committerGustavo F. Padovan <padovan@profusion.mobi>
Thu, 22 Dec 2011 20:02:06 +0000 (18:02 -0200)
It was never used, so removing it.

Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
include/net/bluetooth/hci_core.h

index 4ff08d6..37d7cb8 100644 (file)
@@ -50,7 +50,6 @@ struct inquiry_entry {
 };
 
 struct inquiry_cache {
-       spinlock_t              lock;
        __u32                   timestamp;
        struct inquiry_entry    *list;
 };
@@ -349,15 +348,9 @@ extern int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb);
 #define INQUIRY_CACHE_AGE_MAX   (HZ*30)   /* 30 seconds */
 #define INQUIRY_ENTRY_AGE_MAX   (HZ*60)   /* 60 seconds */
 
-#define inquiry_cache_lock(c)          spin_lock(&c->lock)
-#define inquiry_cache_unlock(c)                spin_unlock(&c->lock)
-#define inquiry_cache_lock_bh(c)       spin_lock_bh(&c->lock)
-#define inquiry_cache_unlock_bh(c)     spin_unlock_bh(&c->lock)
-
 static inline void inquiry_cache_init(struct hci_dev *hdev)
 {
        struct inquiry_cache *c = &hdev->inq_cache;
-       spin_lock_init(&c->lock);
        c->list = NULL;
 }