1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 66b58fd09fbe..d1209adc882d 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -394,12 +394,13 @@ static int btmrvl_send_frame(struct sk_buff *skb)
 
         BT_DBG("type=%d, len=%d", skb->pkt_type, skb->len);
 
-        if (!hdev || !hdev->driver_data) {
+        if (!hdev) {
                 BT_ERR("Frame for unknown HCI device");
                 return -ENODEV;
         }
 
-        priv = (struct btmrvl_private *) hdev->driver_data;
+        priv = hci_get_drvdata(hdev);
+
         if (!test_bit(HCI_RUNNING, &hdev->flags)) {
                 BT_ERR("Failed testing HCI_RUNING, flags=%lx", hdev->flags);
                 print_hex_dump_bytes("data: ", DUMP_PREFIX_OFFSET,
@@ -430,7 +431,7 @@ static int btmrvl_send_frame(struct sk_buff *skb)
 
 static int btmrvl_flush(struct hci_dev *hdev)
 {
-        struct btmrvl_private *priv = hdev->driver_data;
+        struct btmrvl_private *priv = hci_get_drvdata(hdev);
 
         skb_queue_purge(&priv->adapter->tx_queue);
 
@@ -439,7 +440,7 @@ static int btmrvl_flush(struct hci_dev *hdev)
 
 static int btmrvl_close(struct hci_dev *hdev)
 {
-        struct btmrvl_private *priv = hdev->driver_data;
+        struct btmrvl_private *priv = hci_get_drvdata(hdev);
 
         if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags))
                 return 0;
@@ -542,7 +543,7 @@ int btmrvl_register_hdev(struct btmrvl_private *priv)
         }
 
         priv->btmrvl_dev.hcidev = hdev;
-        hdev->driver_data = priv;
+        hci_set_drvdata(hdev, priv);
 
         hdev->bus = HCI_SDIO;
         hdev->open = btmrvl_open;