aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/sco.c
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-05-16 23:36:21 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2012-06-04 23:34:01 -0400
commitbe7c2b99e9cde90e398f61121f3f45d65d5644c7 (patch)
tree0c04a779205b07bd2053b9c3d4b6edd0703fb301 /net/bluetooth/sco.c
parent8ce8e2b56f36c737888d040016f103d91ecbfbad (diff)
Bluetooth: Fix coding style in sco.c
Follow the net subsystem rules. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/sco.c')
-rw-r--r--net/bluetooth/sco.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index cbdd313659a7..78473ff7cc8d 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -523,7 +523,7 @@ static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen
523 goto done; 523 goto done;
524 524
525 err = bt_sock_wait_state(sk, BT_CONNECTED, 525 err = bt_sock_wait_state(sk, BT_CONNECTED,
526 sock_sndtimeo(sk, flags & O_NONBLOCK)); 526 sock_sndtimeo(sk, flags & O_NONBLOCK));
527 527
528done: 528done:
529 release_sock(sk); 529 release_sock(sk);
@@ -788,7 +788,7 @@ static int sco_sock_shutdown(struct socket *sock, int how)
788 788
789 if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime) 789 if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)
790 err = bt_sock_wait_state(sk, BT_CLOSED, 790 err = bt_sock_wait_state(sk, BT_CLOSED,
791 sk->sk_lingertime); 791 sk->sk_lingertime);
792 } 792 }
793 release_sock(sk); 793 release_sock(sk);
794 return err; 794 return err;
@@ -878,7 +878,7 @@ static void sco_conn_ready(struct sco_conn *conn)
878 bh_lock_sock(parent); 878 bh_lock_sock(parent);
879 879
880 sk = sco_sock_alloc(sock_net(parent), NULL, 880 sk = sco_sock_alloc(sock_net(parent), NULL,
881 BTPROTO_SCO, GFP_ATOMIC); 881 BTPROTO_SCO, GFP_ATOMIC);
882 if (!sk) { 882 if (!sk) {
883 bh_unlock_sock(parent); 883 bh_unlock_sock(parent);
884 goto done; 884 goto done;
@@ -920,7 +920,7 @@ int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr)
920 continue; 920 continue;
921 921
922 if (!bacmp(&bt_sk(sk)->src, &hdev->bdaddr) || 922 if (!bacmp(&bt_sk(sk)->src, &hdev->bdaddr) ||
923 !bacmp(&bt_sk(sk)->src, BDADDR_ANY)) { 923 !bacmp(&bt_sk(sk)->src, BDADDR_ANY)) {
924 lm |= HCI_LM_ACCEPT; 924 lm |= HCI_LM_ACCEPT;
925 break; 925 break;
926 } 926 }
@@ -981,7 +981,7 @@ static int sco_debugfs_show(struct seq_file *f, void *p)
981 981
982 sk_for_each(sk, node, &sco_sk_list.head) { 982 sk_for_each(sk, node, &sco_sk_list.head) {
983 seq_printf(f, "%s %s %d\n", batostr(&bt_sk(sk)->src), 983 seq_printf(f, "%s %s %d\n", batostr(&bt_sk(sk)->src),
984 batostr(&bt_sk(sk)->dst), sk->sk_state); 984 batostr(&bt_sk(sk)->dst), sk->sk_state);
985 } 985 }
986 986
987 read_unlock(&sco_sk_list.lock); 987 read_unlock(&sco_sk_list.lock);
@@ -1044,8 +1044,8 @@ int __init sco_init(void)
1044 } 1044 }
1045 1045
1046 if (bt_debugfs) { 1046 if (bt_debugfs) {
1047 sco_debugfs = debugfs_create_file("sco", 0444, 1047 sco_debugfs = debugfs_create_file("sco", 0444, bt_debugfs,
1048 bt_debugfs, NULL, &sco_debugfs_fops); 1048 NULL, &sco_debugfs_fops);
1049 if (!sco_debugfs) 1049 if (!sco_debugfs)
1050 BT_ERR("Failed to create SCO debug file"); 1050 BT_ERR("Failed to create SCO debug file");
1051 } 1051 }