From dd330afbc9cc42d503bf4ac5f877cb8d8ec5fdcc Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Thu, 22 Dec 2011 16:15:42 -0200 Subject: [PATCH] --- yaml --- r: 279395 b: refs/heads/master c: 460da45d92f19adda1b79910652d5a23c65dd272 h: refs/heads/master i: 279393: 5a666bbbd08aa74cf38bc44f25e5e1feb9eb4708 279391: 95664ea35fa36f95d7c13345b2d4ce08e10982e5 v: v3 --- [refs] | 2 +- trunk/include/net/bluetooth/hci_core.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 476de916df67..9fe01a6f6194 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fb9b3d4e5d720d4033461519af0d3f789924015 +refs/heads/master: 460da45d92f19adda1b79910652d5a23c65dd272 diff --git a/trunk/include/net/bluetooth/hci_core.h b/trunk/include/net/bluetooth/hci_core.h index 4ff08d61eea5..37d7cb8be480 100644 --- a/trunk/include/net/bluetooth/hci_core.h +++ b/trunk/include/net/bluetooth/hci_core.h @@ -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; }