diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-23 03:04:21 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-06-04 23:34:08 -0400 |
commit | 8fc9ced398824739d3c25c8aa7f6f34d8e7a49d9 (patch) | |
tree | 1ebdf750d6906ff4fc1f1752e8a392aeb9c1e24a /net/bluetooth/mgmt.c | |
parent | c3c7ea65941a0b7a4f1b9655e7aaaab6ce1874d2 (diff) |
Bluetooth: Fix coding style in the subsystem
This is some leftover from the last patches that fixed style. It is mostly
line over 80 characters fixes reported by checkpatch.pl.
checkpatch.pl is clean for these files now.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index df03c7d20331..984afe4ef407 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -714,7 +714,8 @@ static struct pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode, | |||
714 | } | 714 | } |
715 | 715 | ||
716 | static void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev, | 716 | static void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev, |
717 | void (*cb)(struct pending_cmd *cmd, void *data), | 717 | void (*cb)(struct pending_cmd *cmd, |
718 | void *data), | ||
718 | void *data) | 719 | void *data) |
719 | { | 720 | { |
720 | struct list_head *p, *n; | 721 | struct list_head *p, *n; |
@@ -1594,7 +1595,8 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data, | |||
1594 | } | 1595 | } |
1595 | 1596 | ||
1596 | if (cp->addr.type == BDADDR_BREDR) | 1597 | if (cp->addr.type == BDADDR_BREDR) |
1597 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->addr.bdaddr); | 1598 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, |
1599 | &cp->addr.bdaddr); | ||
1598 | else | 1600 | else |
1599 | conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr); | 1601 | conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr); |
1600 | 1602 | ||
@@ -3226,7 +3228,8 @@ int mgmt_user_confirm_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | |||
3226 | u8 link_type, u8 addr_type, u8 status) | 3228 | u8 link_type, u8 addr_type, u8 status) |
3227 | { | 3229 | { |
3228 | return user_pairing_resp_complete(hdev, bdaddr, link_type, addr_type, | 3230 | return user_pairing_resp_complete(hdev, bdaddr, link_type, addr_type, |
3229 | status, MGMT_OP_USER_CONFIRM_NEG_REPLY); | 3231 | status, |
3232 | MGMT_OP_USER_CONFIRM_NEG_REPLY); | ||
3230 | } | 3233 | } |
3231 | 3234 | ||
3232 | int mgmt_user_passkey_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | 3235 | int mgmt_user_passkey_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, |
@@ -3240,7 +3243,8 @@ int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | |||
3240 | u8 link_type, u8 addr_type, u8 status) | 3243 | u8 link_type, u8 addr_type, u8 status) |
3241 | { | 3244 | { |
3242 | return user_pairing_resp_complete(hdev, bdaddr, link_type, addr_type, | 3245 | return user_pairing_resp_complete(hdev, bdaddr, link_type, addr_type, |
3243 | status, MGMT_OP_USER_PASSKEY_NEG_REPLY); | 3246 | status, |
3247 | MGMT_OP_USER_PASSKEY_NEG_REPLY); | ||
3244 | } | 3248 | } |
3245 | 3249 | ||
3246 | int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 3250 | int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |