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

diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 6b1261f9deb..1fcd9238035 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -561,7 +561,7 @@ static irqreturn_t bluecard_interrupt(int irq, void *dev_inst)
 
 static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud)
 {
-        bluecard_info_t *info = (bluecard_info_t *)(hdev->driver_data);
+        bluecard_info_t *info = hci_get_drvdata(hdev);
         struct sk_buff *skb;
 
         /* Ericsson baud rate command */
@@ -609,7 +609,7 @@ static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud)
 
 static int bluecard_hci_flush(struct hci_dev *hdev)
 {
-        bluecard_info_t *info = (bluecard_info_t *)(hdev->driver_data);
+        bluecard_info_t *info = hci_get_drvdata(hdev);
 
         /* Drop TX queue */
         skb_queue_purge(&(info->txq));
@@ -620,7 +620,7 @@ static int bluecard_hci_flush(struct hci_dev *hdev)
 
 static int bluecard_hci_open(struct hci_dev *hdev)
 {
-        bluecard_info_t *info = (bluecard_info_t *)(hdev->driver_data);
+        bluecard_info_t *info = hci_get_drvdata(hdev);
         unsigned int iobase = info->p_dev->resource[0]->start;
 
         if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state)))
@@ -640,7 +640,7 @@ static int bluecard_hci_open(struct hci_dev *hdev)
 
 static int bluecard_hci_close(struct hci_dev *hdev)
 {
-        bluecard_info_t *info = (bluecard_info_t *)(hdev->driver_data);
+        bluecard_info_t *info = hci_get_drvdata(hdev);
         unsigned int iobase = info->p_dev->resource[0]->start;
 
         if (!test_and_clear_bit(HCI_RUNNING, &(hdev->flags)))
@@ -667,7 +667,7 @@ static int bluecard_hci_send_frame(struct sk_buff *skb)
                 return -ENODEV;
         }
 
-        info = (bluecard_info_t *)(hdev->driver_data);
+        info = hci_get_drvdata(hdev);
 
         switch (bt_cb(skb)->pkt_type) {
         case HCI_COMMAND_PKT:
@@ -729,7 +729,7 @@ static int bluecard_open(bluecard_info_t *info)
         info->hdev = hdev;
 
         hdev->bus = HCI_PCCARD;
-        hdev->driver_data = info;
+        hci_set_drvdata(hdev, info);
         SET_HCIDEV_DEV(hdev, &info->p_dev->dev);
 
         hdev->open     = bluecard_hci_open;