diff options
author | Mikel Astiz <mikel.astiz@bmw-carit.de> | 2012-08-09 03:52:29 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-08-21 13:54:40 -0400 |
commit | fa1bd91809d58b3c183611556219fafd93c08625 (patch) | |
tree | 44a1a3cbcb2507de43b971890826c9eac1cd8d43 /net/bluetooth/hci_event.c | |
parent | cdcba7c6508502cddb07c84a4d14d8f624e8f168 (diff) |
Bluetooth: Fix minor coding style in hci_event.c
Replace the status checks with the short form of the boolean expression.
Signed-off-by: Mikel Astiz <mikel.astiz@bmw-carit.de>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 32e21ad36a68..bfa9bcc0f5ef 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -303,7 +303,7 @@ static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb) | |||
303 | 303 | ||
304 | hci_dev_lock(hdev); | 304 | hci_dev_lock(hdev); |
305 | 305 | ||
306 | if (status != 0) { | 306 | if (status) { |
307 | mgmt_write_scan_failed(hdev, param, status); | 307 | mgmt_write_scan_failed(hdev, param, status); |
308 | hdev->discov_timeout = 0; | 308 | hdev->discov_timeout = 0; |
309 | goto done; | 309 | goto done; |
@@ -925,7 +925,7 @@ static void hci_cc_pin_code_reply(struct hci_dev *hdev, struct sk_buff *skb) | |||
925 | if (test_bit(HCI_MGMT, &hdev->dev_flags)) | 925 | if (test_bit(HCI_MGMT, &hdev->dev_flags)) |
926 | mgmt_pin_code_reply_complete(hdev, &rp->bdaddr, rp->status); | 926 | mgmt_pin_code_reply_complete(hdev, &rp->bdaddr, rp->status); |
927 | 927 | ||
928 | if (rp->status != 0) | 928 | if (rp->status) |
929 | goto unlock; | 929 | goto unlock; |
930 | 930 | ||
931 | cp = hci_sent_cmd_data(hdev, HCI_OP_PIN_CODE_REPLY); | 931 | cp = hci_sent_cmd_data(hdev, HCI_OP_PIN_CODE_REPLY); |
@@ -1893,7 +1893,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
1893 | 1893 | ||
1894 | if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags) && | 1894 | if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags) && |
1895 | (conn->type == ACL_LINK || conn->type == LE_LINK)) { | 1895 | (conn->type == ACL_LINK || conn->type == LE_LINK)) { |
1896 | if (ev->status != 0) | 1896 | if (ev->status) |
1897 | mgmt_disconnect_failed(hdev, &conn->dst, conn->type, | 1897 | mgmt_disconnect_failed(hdev, &conn->dst, conn->type, |
1898 | conn->dst_type, ev->status); | 1898 | conn->dst_type, ev->status); |
1899 | else | 1899 | else |
@@ -3262,7 +3262,7 @@ static void hci_simple_pair_complete_evt(struct hci_dev *hdev, | |||
3262 | * initiated the authentication. A traditional auth_complete | 3262 | * initiated the authentication. A traditional auth_complete |
3263 | * event gets always produced as initiator and is also mapped to | 3263 | * event gets always produced as initiator and is also mapped to |
3264 | * the mgmt_auth_failed event */ | 3264 | * the mgmt_auth_failed event */ |
3265 | if (!test_bit(HCI_CONN_AUTH_PEND, &conn->flags) && ev->status != 0) | 3265 | if (!test_bit(HCI_CONN_AUTH_PEND, &conn->flags) && ev->status) |
3266 | mgmt_auth_failed(hdev, &conn->dst, conn->type, conn->dst_type, | 3266 | mgmt_auth_failed(hdev, &conn->dst, conn->type, conn->dst_type, |
3267 | ev->status); | 3267 | ev->status); |
3268 | 3268 | ||