Skip to content

Commit

Permalink
Bluetooth: Fix coding style in sco.c
Browse files Browse the repository at this point in the history
Follow the net subsystem rules.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Gustavo Padovan authored and Johan Hedberg committed Jun 5, 2012
1 parent 8ce8e2b commit be7c2b9
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions net/bluetooth/sco.c
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen
goto done;

err = bt_sock_wait_state(sk, BT_CONNECTED,
sock_sndtimeo(sk, flags & O_NONBLOCK));
sock_sndtimeo(sk, flags & O_NONBLOCK));

done:
release_sock(sk);
Expand Down Expand Up @@ -788,7 +788,7 @@ static int sco_sock_shutdown(struct socket *sock, int how)

if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)
err = bt_sock_wait_state(sk, BT_CLOSED,
sk->sk_lingertime);
sk->sk_lingertime);
}
release_sock(sk);
return err;
Expand Down Expand Up @@ -878,7 +878,7 @@ static void sco_conn_ready(struct sco_conn *conn)
bh_lock_sock(parent);

sk = sco_sock_alloc(sock_net(parent), NULL,
BTPROTO_SCO, GFP_ATOMIC);
BTPROTO_SCO, GFP_ATOMIC);
if (!sk) {
bh_unlock_sock(parent);
goto done;
Expand Down Expand Up @@ -920,7 +920,7 @@ int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr)
continue;

if (!bacmp(&bt_sk(sk)->src, &hdev->bdaddr) ||
!bacmp(&bt_sk(sk)->src, BDADDR_ANY)) {
!bacmp(&bt_sk(sk)->src, BDADDR_ANY)) {
lm |= HCI_LM_ACCEPT;
break;
}
Expand Down Expand Up @@ -981,7 +981,7 @@ static int sco_debugfs_show(struct seq_file *f, void *p)

sk_for_each(sk, node, &sco_sk_list.head) {
seq_printf(f, "%s %s %d\n", batostr(&bt_sk(sk)->src),
batostr(&bt_sk(sk)->dst), sk->sk_state);
batostr(&bt_sk(sk)->dst), sk->sk_state);
}

read_unlock(&sco_sk_list.lock);
Expand Down Expand Up @@ -1044,8 +1044,8 @@ int __init sco_init(void)
}

if (bt_debugfs) {
sco_debugfs = debugfs_create_file("sco", 0444,
bt_debugfs, NULL, &sco_debugfs_fops);
sco_debugfs = debugfs_create_file("sco", 0444, bt_debugfs,
NULL, &sco_debugfs_fops);
if (!sco_debugfs)
BT_ERR("Failed to create SCO debug file");
}
Expand Down

0 comments on commit be7c2b9

Please sign in to comment.