summaryrefslogtreecommitdiff
path: root/net/bluetooth/sco.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/sco.c')
-rw-r--r--net/bluetooth/sco.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 2209fd2ff2e3..46c3f086a261 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -76,7 +76,7 @@ static void sco_sock_timeout(unsigned long arg)
{
struct sock *sk = (struct sock *)arg;
- BT_DBG("sock %p state %d", sk, sk->sk_state);
+ BT_DBG("sock %pK state %d", sk, sk->sk_state);
bh_lock_sock(sk);
sk->sk_err = ETIMEDOUT;
@@ -89,13 +89,13 @@ static void sco_sock_timeout(unsigned long arg)
static void sco_sock_set_timer(struct sock *sk, long timeout)
{
- BT_DBG("sock %p state %d timeout %ld", sk, sk->sk_state, timeout);
+ BT_DBG("sock %pK state %d timeout %ld", sk, sk->sk_state, timeout);
sk_reset_timer(sk, &sk->sk_timer, jiffies + timeout);
}
static void sco_sock_clear_timer(struct sock *sk)
{
- BT_DBG("sock %p state %d", sk, sk->sk_state);
+ BT_DBG("sock %pK state %d", sk, sk->sk_state);
sk_stop_timer(sk, &sk->sk_timer);
}
@@ -122,7 +122,7 @@ static struct sco_conn *sco_conn_add(struct hci_conn *hcon)
else
conn->mtu = 60;
- BT_DBG("hcon %p conn %p", hcon, conn);
+ BT_DBG("hcon %pK conn %pK", hcon, conn);
return conn;
}
@@ -135,7 +135,7 @@ static void sco_chan_del(struct sock *sk, int err)
conn = sco_pi(sk)->conn;
- BT_DBG("sk %p, conn %p, err %d", sk, conn, err);
+ BT_DBG("sk %pK, conn %pK, err %d", sk, conn, err);
if (conn) {
sco_conn_lock(conn);
@@ -162,7 +162,7 @@ static void sco_conn_del(struct hci_conn *hcon, int err)
if (!conn)
return;
- BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);
+ BT_DBG("hcon %pK conn %pK, err %d", hcon, conn, err);
/* Kill socket */
sco_conn_lock(conn);
@@ -186,7 +186,7 @@ static void sco_conn_del(struct hci_conn *hcon, int err)
static void __sco_chan_add(struct sco_conn *conn, struct sock *sk,
struct sock *parent)
{
- BT_DBG("conn %p", conn);
+ BT_DBG("conn %pK", conn);
sco_pi(sk)->conn = conn;
conn->sk = sk;
@@ -281,7 +281,7 @@ static int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
if (len > conn->mtu)
return -EINVAL;
- BT_DBG("sk %p len %d", sk, len);
+ BT_DBG("sk %pK len %d", sk, len);
skb = bt_skb_send_alloc(sk, len, msg->msg_flags & MSG_DONTWAIT, &err);
if (!skb)
@@ -308,7 +308,7 @@ static void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb)
if (!sk)
goto drop;
- BT_DBG("sk %p len %d", sk, skb->len);
+ BT_DBG("sk %pK len %d", sk, skb->len);
if (sk->sk_state != BT_CONNECTED)
goto drop;
@@ -365,7 +365,7 @@ static struct sock *sco_get_sock_listen(bdaddr_t *src)
static void sco_sock_destruct(struct sock *sk)
{
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
skb_queue_purge(&sk->sk_receive_queue);
skb_queue_purge(&sk->sk_write_queue);
@@ -375,7 +375,7 @@ static void sco_sock_cleanup_listen(struct sock *parent)
{
struct sock *sk;
- BT_DBG("parent %p", parent);
+ BT_DBG("parent %pK", parent);
/* Close not yet accepted channels */
while ((sk = bt_accept_dequeue(parent, NULL))) {
@@ -396,7 +396,7 @@ static void sco_sock_kill(struct sock *sk)
sock_flag(sk, SOCK_DEAD))
return;
- BT_DBG("sk %p state %d", sk, sk->sk_state);
+ BT_DBG("sk %pK state %d", sk, sk->sk_state);
/* Kill poor orphan */
bt_sock_unlink(&sco_sk_list, sk);
@@ -406,7 +406,7 @@ static void sco_sock_kill(struct sock *sk)
static void __sco_sock_close(struct sock *sk)
{
- BT_DBG("sk %p state %d socket %p", sk, sk->sk_state, sk->sk_socket);
+ BT_DBG("sk %pK state %d socket %pK", sk, sk->sk_state, sk->sk_socket);
switch (sk->sk_state) {
case BT_LISTEN:
@@ -450,7 +450,7 @@ static void sco_sock_close(struct sock *sk)
static void sco_sock_init(struct sock *sk, struct sock *parent)
{
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
if (parent) {
sk->sk_type = parent->sk_type;
@@ -498,7 +498,7 @@ static int sco_sock_create(struct net *net, struct socket *sock, int protocol,
{
struct sock *sk;
- BT_DBG("sock %p", sock);
+ BT_DBG("sock %pK", sock);
sock->state = SS_UNCONNECTED;
@@ -522,7 +522,7 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr,
struct sock *sk = sock->sk;
int err = 0;
- BT_DBG("sk %p %pMR", sk, &sa->sco_bdaddr);
+ BT_DBG("sk %pK %pMR", sk, &sa->sco_bdaddr);
if (!addr || addr->sa_family != AF_BLUETOOTH)
return -EINVAL;
@@ -557,7 +557,7 @@ static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen
struct sock *sk = sock->sk;
int err;
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
if (alen < sizeof(struct sockaddr_sco) ||
addr->sa_family != AF_BLUETOOTH)
@@ -592,7 +592,7 @@ static int sco_sock_listen(struct socket *sock, int backlog)
bdaddr_t *src = &sco_pi(sk)->src;
int err = 0;
- BT_DBG("sk %p backlog %d", sk, backlog);
+ BT_DBG("sk %pK backlog %d", sk, backlog);
lock_sock(sk);
@@ -638,7 +638,7 @@ static int sco_sock_accept(struct socket *sock, struct socket *newsock,
timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
- BT_DBG("sk %p timeo %ld", sk, timeo);
+ BT_DBG("sk %pK timeo %ld", sk, timeo);
/* Wait for an incoming connection. (wake-one). */
add_wait_queue_exclusive(sk_sleep(sk), &wait);
@@ -674,7 +674,7 @@ static int sco_sock_accept(struct socket *sock, struct socket *newsock,
newsock->state = SS_CONNECTED;
- BT_DBG("new socket %p", ch);
+ BT_DBG("new socket %pK", ch);
done:
release_sock(sk);
@@ -687,7 +687,7 @@ static int sco_sock_getname(struct socket *sock, struct sockaddr *addr,
struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;
struct sock *sk = sock->sk;
- BT_DBG("sock %p, sk %p", sock, sk);
+ BT_DBG("sock %pK, sk %pK", sock, sk);
addr->sa_family = AF_BLUETOOTH;
*len = sizeof(struct sockaddr_sco);
@@ -706,7 +706,7 @@ static int sco_sock_sendmsg(struct socket *sock, struct msghdr *msg,
struct sock *sk = sock->sk;
int err;
- BT_DBG("sock %p, sk %p", sock, sk);
+ BT_DBG("sock %pK, sk %pK", sock, sk);
err = sock_error(sk);
if (err)
@@ -730,7 +730,7 @@ static void sco_conn_defer_accept(struct hci_conn *conn, u16 setting)
{
struct hci_dev *hdev = conn->hdev;
- BT_DBG("conn %p", conn);
+ BT_DBG("conn %pK", conn);
conn->state = BT_CONFIG;
@@ -800,7 +800,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
struct bt_voice voice;
u32 opt;
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
lock_sock(sk);
@@ -865,7 +865,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname,
struct sco_conninfo cinfo;
int len, err = 0;
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
if (get_user(len, optlen))
return -EFAULT;
@@ -925,7 +925,7 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname,
int len, err = 0;
struct bt_voice voice;
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
if (level == SOL_SCO)
return sco_sock_getsockopt_old(sock, optname, optval, optlen);
@@ -972,7 +972,7 @@ static int sco_sock_shutdown(struct socket *sock, int how)
struct sock *sk = sock->sk;
int err = 0;
- BT_DBG("sock %p, sk %p", sock, sk);
+ BT_DBG("sock %pK, sk %pK", sock, sk);
if (!sk)
return 0;
@@ -1002,7 +1002,7 @@ static int sco_sock_release(struct socket *sock)
struct sock *sk = sock->sk;
int err = 0;
- BT_DBG("sock %p, sk %p", sock, sk);
+ BT_DBG("sock %pK, sk %pK", sock, sk);
if (!sk)
return 0;
@@ -1026,7 +1026,7 @@ static void sco_conn_ready(struct sco_conn *conn)
struct sock *parent;
struct sock *sk = conn->sk;
- BT_DBG("conn %p", conn);
+ BT_DBG("conn %pK", conn);
if (sk) {
sco_sock_clear_timer(sk);
@@ -1113,7 +1113,7 @@ static void sco_connect_cfm(struct hci_conn *hcon, __u8 status)
if (hcon->type != SCO_LINK && hcon->type != ESCO_LINK)
return;
- BT_DBG("hcon %p bdaddr %pMR status %d", hcon, &hcon->dst, status);
+ BT_DBG("hcon %pK bdaddr %pMR status %d", hcon, &hcon->dst, status);
if (!status) {
struct sco_conn *conn;
@@ -1130,7 +1130,7 @@ static void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason)
if (hcon->type != SCO_LINK && hcon->type != ESCO_LINK)
return;
- BT_DBG("hcon %p reason %d", hcon, reason);
+ BT_DBG("hcon %pK reason %d", hcon, reason);
sco_conn_del(hcon, bt_to_errno(reason));
}
@@ -1142,7 +1142,7 @@ void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb)
if (!conn)
goto drop;
- BT_DBG("conn %p len %d", conn, skb->len);
+ BT_DBG("conn %pK len %d", conn, skb->len);
if (skb->len) {
sco_recv_frame(conn, skb);