aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@googlemail.com>2012-01-07 09:47:24 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 10:01:24 -0500
commitdc946bd86f725c42c3ab1caf9966d29f5b364fea (patch)
tree65ad1d42be0718f9eb795952ad78429b74865c7d /drivers/bluetooth
parent4c724c7135ca2b407bd318b4267456a7b5723825 (diff)
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')
-rw-r--r--drivers/bluetooth/btusb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index a36888a9c205..d7664ffc5183 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -1079,7 +1079,7 @@ static void btusb_disconnect(struct usb_interface *intf)
1079 1079
1080 hdev = data->hdev; 1080 hdev = data->hdev;
1081 1081
1082 __hci_dev_hold(hdev); 1082 hci_dev_hold(hdev);
1083 1083
1084 usb_set_intfdata(data->intf, NULL); 1084 usb_set_intfdata(data->intf, NULL);
1085 1085
@@ -1093,7 +1093,7 @@ static void btusb_disconnect(struct usb_interface *intf)
1093 else if (data->isoc) 1093 else if (data->isoc)
1094 usb_driver_release_interface(&btusb_driver, data->isoc); 1094 usb_driver_release_interface(&btusb_driver, data->isoc);
1095 1095
1096 __hci_dev_put(hdev); 1096 hci_dev_put(hdev);
1097 1097
1098 hci_free_dev(hdev); 1098 hci_free_dev(hdev);
1099 kfree(data); 1099 kfree(data);