diff options
author | Lukasz Rymanowski <lukasz.rymanowski@tieto.com> | 2012-04-19 10:12:28 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo@padovan.org> | 2012-05-09 00:40:37 -0400 |
commit | 519e42b38ee47005aaa2243789cda54161e62dc8 (patch) | |
tree | 1fc25cac07af0cb353473111fee3b573eee2e436 | |
parent | 7d5d775a55554183448b591a86b1d172ae993b94 (diff) |
Bluetooth: Remove not needed status parameter
Sco_conn_add is called from two places and always with status = 0.
Signed-off-by: Lukasz Rymanowski <lukasz.rymanowski@tieto.com>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
-rw-r--r-- | net/bluetooth/sco.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index a69aa345597e..84d7a8023f80 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
@@ -93,12 +93,12 @@ static void sco_sock_clear_timer(struct sock *sk) | |||
93 | } | 93 | } |
94 | 94 | ||
95 | /* ---- SCO connections ---- */ | 95 | /* ---- SCO connections ---- */ |
96 | static struct sco_conn *sco_conn_add(struct hci_conn *hcon, __u8 status) | 96 | static struct sco_conn *sco_conn_add(struct hci_conn *hcon) |
97 | { | 97 | { |
98 | struct hci_dev *hdev = hcon->hdev; | 98 | struct hci_dev *hdev = hcon->hdev; |
99 | struct sco_conn *conn = hcon->sco_data; | 99 | struct sco_conn *conn = hcon->sco_data; |
100 | 100 | ||
101 | if (conn || status) | 101 | if (conn) |
102 | return conn; | 102 | return conn; |
103 | 103 | ||
104 | conn = kzalloc(sizeof(struct sco_conn), GFP_ATOMIC); | 104 | conn = kzalloc(sizeof(struct sco_conn), GFP_ATOMIC); |
@@ -199,7 +199,7 @@ static int sco_connect(struct sock *sk) | |||
199 | goto done; | 199 | goto done; |
200 | } | 200 | } |
201 | 201 | ||
202 | conn = sco_conn_add(hcon, 0); | 202 | conn = sco_conn_add(hcon); |
203 | if (!conn) { | 203 | if (!conn) { |
204 | hci_conn_put(hcon); | 204 | hci_conn_put(hcon); |
205 | err = -ENOMEM; | 205 | err = -ENOMEM; |
@@ -924,7 +924,7 @@ int sco_connect_cfm(struct hci_conn *hcon, __u8 status) | |||
924 | if (!status) { | 924 | if (!status) { |
925 | struct sco_conn *conn; | 925 | struct sco_conn *conn; |
926 | 926 | ||
927 | conn = sco_conn_add(hcon, status); | 927 | conn = sco_conn_add(hcon); |
928 | if (conn) | 928 | if (conn) |
929 | sco_conn_ready(conn); | 929 | sco_conn_ready(conn); |
930 | } else | 930 | } else |