Bluetooth: Remove hci_dev->driver_data

The linux device model provides dev_set/get_drvdata so we can use this
to save private driver data.
This also removes several unnecessary casts.

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>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 5f305c131a0d..158bfe507da7 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -61,7 +61,7 @@ static int vhci_open_dev(struct hci_dev *hdev)
 
 static int vhci_close_dev(struct hci_dev *hdev)
 {
-        struct vhci_data *data = hdev->driver_data;
+        struct vhci_data *data = hci_get_drvdata(hdev);
 
         if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags))
                 return 0;
@@ -73,7 +73,7 @@ static int vhci_close_dev(struct hci_dev *hdev)
 
 static int vhci_flush(struct hci_dev *hdev)
 {
-        struct vhci_data *data = hdev->driver_data;
+        struct vhci_data *data = hci_get_drvdata(hdev);
 
         skb_queue_purge(&data->readq);
 
@@ -93,7 +93,7 @@ static int vhci_send_frame(struct sk_buff *skb)
         if (!test_bit(HCI_RUNNING, &hdev->flags))
                 return -EBUSY;
 
-        data = hdev->driver_data;
+        data = hci_get_drvdata(hdev);
 
         memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);
         skb_queue_tail(&data->readq, skb);
@@ -234,7 +234,7 @@ static int vhci_open(struct inode *inode, struct file *file)
         data->hdev = hdev;
 
         hdev->bus = HCI_VIRTUAL;
-        hdev->driver_data = data;
+        hci_set_drvdata(hdev, data);
 
         if (amp)
                 hdev->dev_type = HCI_AMP;