提交 d5fb2962 编写于 作者: R Robert P. J. Day 提交者: David S. Miller

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: NRobert P. J. Day <rpjday@crashcourse.ca>
Acked-by: NMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 293a3839
...@@ -84,7 +84,7 @@ static struct hci_sec_filter hci_sec_filter = { ...@@ -84,7 +84,7 @@ static struct hci_sec_filter hci_sec_filter = {
}; };
static struct bt_sock_list hci_sk_list = { 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 */ /* Send frame to RAW socket */
......
...@@ -62,7 +62,7 @@ static u32 l2cap_feat_mask = 0x0000; ...@@ -62,7 +62,7 @@ static u32 l2cap_feat_mask = 0x0000;
static const struct proto_ops l2cap_sock_ops; static const struct proto_ops l2cap_sock_ops;
static struct bt_sock_list l2cap_sk_list = { 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); static void __l2cap_sock_close(struct sock *sk, int reason);
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
static const struct proto_ops rfcomm_sock_ops; static const struct proto_ops rfcomm_sock_ops;
static struct bt_sock_list rfcomm_sk_list = { 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); static void rfcomm_sock_close(struct sock *sk);
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
static const struct proto_ops sco_sock_ops; static const struct proto_ops sco_sock_ops;
static struct bt_sock_list sco_sk_list = { 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); static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册