lkml.org 
[lkml]   [2009]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[Patch RFC 15/37] bluetooth: Convert hdev->req_lock to mutex
hdev->req_lock is used as mutex so make it a mutex.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Marcel Holtmann <marcel@holtmann.org>
---
include/net/bluetooth/hci_core.h | 6 +++---
net/bluetooth/hci_core.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6-tip/include/net/bluetooth/hci_core.h
===================================================================
--- linux-2.6-tip.orig/include/net/bluetooth/hci_core.h
+++ linux-2.6-tip/include/net/bluetooth/hci_core.h
@@ -117,7 +117,7 @@ struct hci_dev {
struct sk_buff *sent_cmd;
struct sk_buff *reassembly[3];

- struct semaphore req_lock;
+ struct mutex req_lock;
wait_queue_head_t req_wait_q;
__u32 req_status;
__u32 req_result;
@@ -700,8 +700,8 @@ struct hci_sec_filter {
#define HCI_REQ_PEND 1
#define HCI_REQ_CANCELED 2

-#define hci_req_lock(d) down(&d->req_lock)
-#define hci_req_unlock(d) up(&d->req_lock)
+#define hci_req_lock(d) mutex_lock(&d->req_lock)
+#define hci_req_unlock(d) mutex_unlock(&d->req_lock)

void hci_req_complete(struct hci_dev *hdev, int result);

Index: linux-2.6-tip/net/bluetooth/hci_core.c
===================================================================
--- linux-2.6-tip.orig/net/bluetooth/hci_core.c
+++ linux-2.6-tip/net/bluetooth/hci_core.c
@@ -911,7 +911,7 @@ int hci_register_dev(struct hci_dev *hde
hdev->reassembly[i] = NULL;

init_waitqueue_head(&hdev->req_wait_q);
- init_MUTEX(&hdev->req_lock);
+ mutex_init(&hdev->req_lock);

inquiry_cache_init(hdev);




\
 
 \ /
  Last update: 2009-07-26 10:25    [W:0.225 / U:11.184 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site