From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Dec 2011 02:09:16 +0000 (+1100)
Subject: Merge commit 'refs/next/20111220/bluetooth'
X-Git-Tag: next-20111221~57
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f42af16ae0dc4a29ad0ed077942b028db4f49c8f;p=karo-tx-linux.git

Merge commit 'refs/next/20111220/bluetooth'
---

f42af16ae0dc4a29ad0ed077942b028db4f49c8f
diff --cc include/net/bluetooth/hci_core.h
index ea4395f1d260,74f8356b9ff1..25c161ab6803
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@@ -592,15 -582,15 +586,13 @@@ static inline struct hci_dev *__hci_dev
  	return d;
  }
  
 -static inline struct hci_dev *hci_dev_hold(struct hci_dev *d)
 -{
 -	if (try_module_get(d->owner))
 -		return __hci_dev_hold(d);
 -	return NULL;
 -}
 +#define hci_dev_hold(d)						\
 +({								\
 +	try_module_get(d->owner) ? __hci_dev_hold(d) : NULL;	\
 +})
  
- #define hci_dev_lock(d)		spin_lock(&d->lock)
- #define hci_dev_unlock(d)	spin_unlock(&d->lock)
- #define hci_dev_lock_bh(d)	spin_lock_bh(&d->lock)
- #define hci_dev_unlock_bh(d)	spin_unlock_bh(&d->lock)
+ #define hci_dev_lock(d)		mutex_lock(&d->lock)
+ #define hci_dev_unlock(d)	mutex_unlock(&d->lock)
  
  struct hci_dev *hci_dev_get(int index);
  struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst);