diff options
author | Szymon Janc <szymon.janc@tieto.com> | 2011-03-01 10:55:34 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-01 20:19:48 -0500 |
commit | b8534e0f2b09e47790c261af0aee86fc88c6eb3c (patch) | |
tree | be78b7ca6c19c8c30362e617ca2d24de99e070f6 /net | |
parent | 3cf2a4f6ca4e088ba79d05d6e7f4635c535e6ae4 (diff) |
Bluetooth: Fix some small code style issues in mgmt.c
Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/mgmt.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index f69dbcb8a707..0054c74e27b7 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -716,8 +716,7 @@ static int set_service_cache(struct sock *sk, u16 index, unsigned char *data, | |||
716 | cp = (void *) data; | 716 | cp = (void *) data; |
717 | 717 | ||
718 | if (len != sizeof(*cp)) | 718 | if (len != sizeof(*cp)) |
719 | return cmd_status(sk, index, MGMT_OP_SET_SERVICE_CACHE, | 719 | return cmd_status(sk, index, MGMT_OP_SET_SERVICE_CACHE, EINVAL); |
720 | EINVAL); | ||
721 | 720 | ||
722 | hdev = hci_dev_get(index); | 721 | hdev = hci_dev_get(index); |
723 | if (!hdev) | 722 | if (!hdev) |
@@ -1058,8 +1057,7 @@ static int set_io_capability(struct sock *sk, u16 index, unsigned char *data, | |||
1058 | cp = (void *) data; | 1057 | cp = (void *) data; |
1059 | 1058 | ||
1060 | if (len != sizeof(*cp)) | 1059 | if (len != sizeof(*cp)) |
1061 | return cmd_status(sk, index, MGMT_OP_SET_IO_CAPABILITY, | 1060 | return cmd_status(sk, index, MGMT_OP_SET_IO_CAPABILITY, EINVAL); |
1062 | EINVAL); | ||
1063 | 1061 | ||
1064 | hdev = hci_dev_get(index); | 1062 | hdev = hci_dev_get(index); |
1065 | if (!hdev) | 1063 | if (!hdev) |
@@ -1070,7 +1068,7 @@ static int set_io_capability(struct sock *sk, u16 index, unsigned char *data, | |||
1070 | hdev->io_capability = cp->io_capability; | 1068 | hdev->io_capability = cp->io_capability; |
1071 | 1069 | ||
1072 | BT_DBG("%s IO capability set to 0x%02x", hdev->name, | 1070 | BT_DBG("%s IO capability set to 0x%02x", hdev->name, |
1073 | hdev->io_capability); | 1071 | hdev->io_capability); |
1074 | 1072 | ||
1075 | hci_dev_unlock_bh(hdev); | 1073 | hci_dev_unlock_bh(hdev); |
1076 | hci_dev_put(hdev); | 1074 | hci_dev_put(hdev); |
@@ -1424,8 +1422,7 @@ int mgmt_discoverable(u16 index, u8 discoverable) | |||
1424 | struct cmd_lookup match = { discoverable, NULL }; | 1422 | struct cmd_lookup match = { discoverable, NULL }; |
1425 | int ret; | 1423 | int ret; |
1426 | 1424 | ||
1427 | mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, index, | 1425 | mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, index, mode_rsp, &match); |
1428 | mode_rsp, &match); | ||
1429 | 1426 | ||
1430 | ev.val = discoverable; | 1427 | ev.val = discoverable; |
1431 | 1428 | ||
@@ -1631,8 +1628,7 @@ int mgmt_user_confirm_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status) | |||
1631 | MGMT_OP_USER_CONFIRM_REPLY); | 1628 | MGMT_OP_USER_CONFIRM_REPLY); |
1632 | } | 1629 | } |
1633 | 1630 | ||
1634 | int mgmt_user_confirm_neg_reply_complete(u16 index, bdaddr_t *bdaddr, | 1631 | int mgmt_user_confirm_neg_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status) |
1635 | u8 status) | ||
1636 | { | 1632 | { |
1637 | return confirm_reply_complete(index, bdaddr, status, | 1633 | return confirm_reply_complete(index, bdaddr, status, |
1638 | MGMT_OP_USER_CONFIRM_NEG_REPLY); | 1634 | MGMT_OP_USER_CONFIRM_NEG_REPLY); |