Commit d5fb2962 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by David S. Miller
Browse files

bluetooth: replace deprecated RW_LOCK_UNLOCKED macros 



The older RW_LOCK_UNLOCKED macros defeat lockdep state tracing so
replace them with the newer __RW_LOCK_UNLOCKED macros.

Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 293a3839

net/bluetooth/hci_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static struct hci_sec_filter hci_sec_filter = { 
};



static struct bt_sock_list hci_sk_list = {

	.lock = RW_LOCK_UNLOCKED

	.lock = __RW_LOCK_UNLOCKED(hci_sk_list.lock)

};



/* Send frame to RAW socket */

net/bluetooth/l2cap.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static u32 l2cap_feat_mask = 0x0000; 
static const struct proto_ops l2cap_sock_ops;



static struct bt_sock_list l2cap_sk_list = {

	.lock = RW_LOCK_UNLOCKED

	.lock = __RW_LOCK_UNLOCKED(l2cap_sk_list.lock)

};



static void __l2cap_sock_close(struct sock *sk, int reason);

net/bluetooth/rfcomm/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
static const struct proto_ops rfcomm_sock_ops;



static struct bt_sock_list rfcomm_sk_list = {

	.lock = RW_LOCK_UNLOCKED

	.lock = __RW_LOCK_UNLOCKED(rfcomm_sk_list.lock)

};



static void rfcomm_sock_close(struct sock *sk);

net/bluetooth/sco.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
static const struct proto_ops sco_sock_ops;



static struct bt_sock_list sco_sk_list = {

	.lock = RW_LOCK_UNLOCKED

	.lock = __RW_LOCK_UNLOCKED(sco_sk_list.lock)

};



static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent);