Browse Source

Bluetooth: Make hci_unregister_dev return void

hci_unregister_dev cannot fail and always returns 0. The drivers already ignore
the return value so we can safely make it return void.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
David Herrmann 13 years ago
parent
commit
59735631d2
2 changed files with 2 additions and 4 deletions
  1. 1 1
      include/net/bluetooth/hci_core.h
  2. 1 3
      net/bluetooth/hci_core.c

+ 1 - 1
include/net/bluetooth/hci_core.h

@@ -554,7 +554,7 @@ struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst);
 struct hci_dev *hci_alloc_dev(void);
 struct hci_dev *hci_alloc_dev(void);
 void hci_free_dev(struct hci_dev *hdev);
 void hci_free_dev(struct hci_dev *hdev);
 int hci_register_dev(struct hci_dev *hdev);
 int hci_register_dev(struct hci_dev *hdev);
-int hci_unregister_dev(struct hci_dev *hdev);
+void hci_unregister_dev(struct hci_dev *hdev);
 int hci_suspend_dev(struct hci_dev *hdev);
 int hci_suspend_dev(struct hci_dev *hdev);
 int hci_resume_dev(struct hci_dev *hdev);
 int hci_resume_dev(struct hci_dev *hdev);
 int hci_dev_open(__u16 dev);
 int hci_dev_open(__u16 dev);

+ 1 - 3
net/bluetooth/hci_core.c

@@ -1541,7 +1541,7 @@ err:
 EXPORT_SYMBOL(hci_register_dev);
 EXPORT_SYMBOL(hci_register_dev);
 
 
 /* Unregister HCI device */
 /* Unregister HCI device */
-int hci_unregister_dev(struct hci_dev *hdev)
+void hci_unregister_dev(struct hci_dev *hdev)
 {
 {
 	int i;
 	int i;
 
 
@@ -1583,8 +1583,6 @@ int hci_unregister_dev(struct hci_dev *hdev)
 	hci_dev_unlock_bh(hdev);
 	hci_dev_unlock_bh(hdev);
 
 
 	__hci_dev_put(hdev);
 	__hci_dev_put(hdev);
-
-	return 0;
 }
 }
 EXPORT_SYMBOL(hci_unregister_dev);
 EXPORT_SYMBOL(hci_unregister_dev);