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

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

Bluetooth: Ignore hci_unregister_dev return value 



Make all bluetooth drivers ignore the return value of hci_unregister_dev as it
always returns 0. In the next step, hci_unregister_dev can be modified to return
void.
Some of the drivers already ignore the return value (including btusb), hence,
this will increase consitency in the bluetooth drivers.

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 96af7391

drivers/bluetooth/bfusb.c

+1 −3
Original line number Diff line number Diff line
@@ -750,9 +750,7 @@ static void bfusb_disconnect(struct usb_interface *intf) 


	bfusb_close(hdev);



	if (hci_unregister_dev(hdev) < 0)

		BT_ERR("Can't unregister HCI device %s", hdev->name);



	hci_unregister_dev(hdev);

	hci_free_dev(hdev);

}

drivers/bluetooth/bluecard_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -844,9 +844,7 @@ static int bluecard_close(bluecard_info_t *info) 
	/* Turn FPGA off */

	outb(0x80, iobase + 0x30);



	if (hci_unregister_dev(hdev) < 0)

		BT_ERR("Can't unregister HCI device %s", hdev->name);



	hci_unregister_dev(hdev);

	hci_free_dev(hdev);



	return 0;

drivers/bluetooth/bt3c_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -636,9 +636,7 @@ static int bt3c_close(bt3c_info_t *info) 


	bt3c_hci_close(hdev);



	if (hci_unregister_dev(hdev) < 0)

		BT_ERR("Can't unregister HCI device %s", hdev->name);



	hci_unregister_dev(hdev);

	hci_free_dev(hdev);



	return 0;

drivers/bluetooth/btuart_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -565,9 +565,7 @@ static int btuart_close(btuart_info_t *info) 


	spin_unlock_irqrestore(&(info->lock), flags);



	if (hci_unregister_dev(hdev) < 0)

		BT_ERR("Can't unregister HCI device %s", hdev->name);



	hci_unregister_dev(hdev);

	hci_free_dev(hdev);



	return 0;

drivers/bluetooth/dtl1_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -551,9 +551,7 @@ static int dtl1_close(dtl1_info_t *info) 


	spin_unlock_irqrestore(&(info->lock), flags);



	if (hci_unregister_dev(hdev) < 0)

		BT_ERR("Can't unregister HCI device %s", hdev->name);



	hci_unregister_dev(hdev);

	hci_free_dev(hdev);



	return 0;