diff options
author | Szymon Janc <szymon.janc@tieto.com> | 2011-02-17 10:46:47 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-02-17 11:31:32 -0500 |
commit | 01df8c31d152493ddc58a0bd1719eac6759add87 (patch) | |
tree | 54e62f840ce4f366b1cb2f11afd7185e81f39334 /net/bluetooth | |
parent | adc4266d87ba95e250e5ffa217c72b4b78c2b56a (diff) |
Bluetooth: Fix some code style issues in hci_core.c
Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/hci_core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 702d5651c656..b372fb8bcdcf 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -124,7 +124,7 @@ static void hci_req_cancel(struct hci_dev *hdev, int err) | |||
124 | 124 | ||
125 | /* Execute request and wait for completion. */ | 125 | /* Execute request and wait for completion. */ |
126 | static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt), | 126 | static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt), |
127 | unsigned long opt, __u32 timeout) | 127 | unsigned long opt, __u32 timeout) |
128 | { | 128 | { |
129 | DECLARE_WAITQUEUE(wait, current); | 129 | DECLARE_WAITQUEUE(wait, current); |
130 | int err = 0; | 130 | int err = 0; |
@@ -166,7 +166,7 @@ static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, | |||
166 | } | 166 | } |
167 | 167 | ||
168 | static inline int hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt), | 168 | static inline int hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt), |
169 | unsigned long opt, __u32 timeout) | 169 | unsigned long opt, __u32 timeout) |
170 | { | 170 | { |
171 | int ret; | 171 | int ret; |
172 | 172 | ||
@@ -465,7 +465,7 @@ int hci_inquiry(void __user *arg) | |||
465 | /* cache_dump can't sleep. Therefore we allocate temp buffer and then | 465 | /* cache_dump can't sleep. Therefore we allocate temp buffer and then |
466 | * copy it to the user space. | 466 | * copy it to the user space. |
467 | */ | 467 | */ |
468 | buf = kmalloc(sizeof(struct inquiry_info) *max_rsp, GFP_KERNEL); | 468 | buf = kmalloc(sizeof(struct inquiry_info) * max_rsp, GFP_KERNEL); |
469 | if (!buf) { | 469 | if (!buf) { |
470 | err = -ENOMEM; | 470 | err = -ENOMEM; |
471 | goto done; | 471 | goto done; |
@@ -534,7 +534,6 @@ int hci_dev_open(__u16 dev) | |||
534 | set_bit(HCI_INIT, &hdev->flags); | 534 | set_bit(HCI_INIT, &hdev->flags); |
535 | hdev->init_last_cmd = 0; | 535 | hdev->init_last_cmd = 0; |
536 | 536 | ||
537 | //__hci_request(hdev, hci_reset_req, 0, HZ); | ||
538 | ret = __hci_request(hdev, hci_init_req, 0, | 537 | ret = __hci_request(hdev, hci_init_req, 0, |
539 | msecs_to_jiffies(HCI_INIT_TIMEOUT)); | 538 | msecs_to_jiffies(HCI_INIT_TIMEOUT)); |
540 | 539 | ||