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, 5 insertions, 5 deletions

diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index 2d6e4ed1637f..e10ea0347051 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -189,7 +189,7 @@ static void btsdio_interrupt(struct sdio_func *func)
 
 static int btsdio_open(struct hci_dev *hdev)
 {
-        struct btsdio_data *data = hdev->driver_data;
+        struct btsdio_data *data = hci_get_drvdata(hdev);
         int err;
 
         BT_DBG("%s", hdev->name);
@@ -225,7 +225,7 @@ release:
 
 static int btsdio_close(struct hci_dev *hdev)
 {
-        struct btsdio_data *data = hdev->driver_data;
+        struct btsdio_data *data = hci_get_drvdata(hdev);
 
         BT_DBG("%s", hdev->name);
 
@@ -246,7 +246,7 @@ static int btsdio_close(struct hci_dev *hdev)
 
 static int btsdio_flush(struct hci_dev *hdev)
 {
-        struct btsdio_data *data = hdev->driver_data;
+        struct btsdio_data *data = hci_get_drvdata(hdev);
 
         BT_DBG("%s", hdev->name);
 
@@ -258,7 +258,7 @@ static int btsdio_flush(struct hci_dev *hdev)
 static int btsdio_send_frame(struct sk_buff *skb)
 {
         struct hci_dev *hdev = (struct hci_dev *) skb->dev;
-        struct btsdio_data *data = hdev->driver_data;
+        struct btsdio_data *data = hci_get_drvdata(hdev);
 
         BT_DBG("%s", hdev->name);
 
@@ -321,7 +321,7 @@ static int btsdio_probe(struct sdio_func *func,
         }
 
         hdev->bus = HCI_SDIO;
-        hdev->driver_data = data;
+        hci_set_drvdata(hdev, data);
 
         if (id->class == SDIO_CLASS_BT_AMP)
                 hdev->dev_type = HCI_AMP;