Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59735631 authored by David Herrmann's avatar David Herrmann Committed by Gustavo Padovan
Browse files

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: default avatarDavid Herrmann <dh.herrmann@googlemail.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 13ea4015

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst); 
struct hci_dev *hci_alloc_dev(void);

void hci_free_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_resume_dev(struct hci_dev *hdev);

int hci_dev_open(__u16 dev);

net/bluetooth/hci_core.c

+1 −3
Original line number Diff line number Diff line
@@ -1541,7 +1541,7 @@ int hci_register_dev(struct hci_dev *hdev) 
EXPORT_SYMBOL(hci_register_dev);



/* Unregister HCI device */

int hci_unregister_dev(struct hci_dev *hdev)

void hci_unregister_dev(struct hci_dev *hdev)

{

	int i;
@@ -1583,8 +1583,6 @@ int hci_unregister_dev(struct hci_dev *hdev) 
	hci_dev_unlock_bh(hdev);



	__hci_dev_put(hdev);



	return 0;

}

EXPORT_SYMBOL(hci_unregister_dev);