diff options
| author | David Herrmann <dh.herrmann@googlemail.com> | 2012-01-07 15:47:24 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 17:01:24 +0200 |
| commit | dc946bd86f725c42c3ab1caf9966d29f5b364fea (patch) | |
| tree | 65ad1d42be0718f9eb795952ad78429b74865c7d /drivers/bluetooth/btusb.c | |
| parent | 4c724c7135ca2b407bd318b4267456a7b5723825 (diff) | |
| download | linux-3.10-dc946bd86f725c42c3ab1caf9966d29f5b364fea.tar.gz linux-3.10-dc946bd86f725c42c3ab1caf9966d29f5b364fea.tar.bz2 linux-3.10-dc946bd86f725c42c3ab1caf9966d29f5b364fea.zip | |
Bluetooth: Remove __hci_dev_put/hold
Since we remove the owner field of hci_dev hci_dev_put and __hci_dev_put
do the same so we can merge them into one function. Same for
hci_dev_hold and __hci_dev_hold.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index a36888a9c20..d7664ffc518 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -1079,7 +1079,7 @@ static void btusb_disconnect(struct usb_interface *intf) hdev = data->hdev; - __hci_dev_hold(hdev); + hci_dev_hold(hdev); usb_set_intfdata(data->intf, NULL); @@ -1093,7 +1093,7 @@ static void btusb_disconnect(struct usb_interface *intf) else if (data->isoc) usb_driver_release_interface(&btusb_driver, data->isoc); - __hci_dev_put(hdev); + hci_dev_put(hdev); hci_free_dev(hdev); kfree(data); |