Skip to content

Commit

Permalink
Bluetooth: Ignore hci_unregister_dev return value
Browse files Browse the repository at this point in the history
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: David Herrmann <dh.herrmann@googlemail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
  • Loading branch information
David Herrmann authored and Gustavo F. Padovan committed Nov 7, 2011
1 parent 96af739 commit 13ea401
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 19 deletions.
4 changes: 1 addition & 3 deletions drivers/bluetooth/bfusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 1 addition & 3 deletions drivers/bluetooth/bluecard_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions drivers/bluetooth/bt3c_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions drivers/bluetooth/btuart_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions drivers/bluetooth/dtl1_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions drivers/bluetooth/hci_vhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,7 @@ static int vhci_release(struct inode *inode, struct file *file)
struct vhci_data *data = file->private_data;
struct hci_dev *hdev = data->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);

file->private_data = NULL;
Expand Down

0 comments on commit 13ea401

Please sign in to comment.