Bluetooth: btmtk: rename btmediatek_data

Rename btmediatek_data to have a consistent prefix throughout the driver.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Chris Lu <chris.lu@mediatek.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
index a27c251..6489e4a 100644 (file)
--- a/drivers/bluetooth/btmtk.c
+++ b/drivers/bluetooth/btmtk.c
@@ -64,7 +64,7 @@ static void btmtk_coredump(struct hci_dev *hdev)
 
 static void btmtk_coredump_hdr(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct btmediatek_data *data = hci_get_priv(hdev);
+       struct btmtk_data *data = hci_get_priv(hdev);
        char buf[80];
 
        snprintf(buf, sizeof(buf), "Controller Name: 0x%X\n",
@@ -85,7 +85,7 @@ static void btmtk_coredump_hdr(struct hci_dev *hdev, struct sk_buff *skb)
 
 static void btmtk_coredump_notify(struct hci_dev *hdev, int state)
 {
-       struct btmediatek_data *data = hci_get_priv(hdev);
+       struct btmtk_data *data = hci_get_priv(hdev);
 
        switch (state) {
        case HCI_DEVCOREDUMP_IDLE:
@@ -355,7 +355,7 @@ EXPORT_SYMBOL_GPL(btmtk_set_bdaddr);
 
 void btmtk_reset_sync(struct hci_dev *hdev)
 {
-       struct btmediatek_data *reset_work = hci_get_priv(hdev);
+       struct btmtk_data *reset_work = hci_get_priv(hdev);
        int err;
 
        hci_dev_lock(hdev);
@@ -371,7 +371,7 @@ EXPORT_SYMBOL_GPL(btmtk_reset_sync);
 int btmtk_register_coredump(struct hci_dev *hdev, const char *name,
                            u32 fw_version)
 {
-       struct btmediatek_data *data = hci_get_priv(hdev);
+       struct btmtk_data *data = hci_get_priv(hdev);
 
        if (!IS_ENABLED(CONFIG_DEV_COREDUMP))
                return -EOPNOTSUPP;
@@ -387,7 +387,7 @@ EXPORT_SYMBOL_GPL(btmtk_register_coredump);
 
 int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct btmediatek_data *data = hci_get_priv(hdev);
+       struct btmtk_data *data = hci_get_priv(hdev);
        int err;
 
        if (!IS_ENABLED(CONFIG_DEV_COREDUMP)) {

diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h
index e76b8a3..dde6fbd 100644 (file)
--- a/drivers/bluetooth/btmtk.h
+++ b/drivers/bluetooth/btmtk.h
@@ -135,7 +135,7 @@ struct btmtk_coredump_info {
        int state;
 };
 
-struct btmediatek_data {
+struct btmtk_data {
        u32 dev_id;
        btmtk_reset_sync_func_t reset_sync;
        struct btmtk_coredump_info cd_info;

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 6785d46..f44bcd2 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3156,7 +3156,7 @@ static int btusb_mtk_subsys_reset(struct hci_dev *hdev, u32 dev_id)
 static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data)
 {
        struct btusb_data *data = hci_get_drvdata(hdev);
-       struct btmediatek_data *mtk_data;
+       struct btmtk_data *btmtk_data = hci_get_priv(hdev);
        int err;
 
        /* It's MediaTek specific bluetooth reset mechanism via USB */
@@ -3171,9 +3171,8 @@ static int btusb_mtk_reset(struct hci_dev *hdev, void *rst_data)
 
        btusb_stop_traffic(data);
        usb_kill_anchored_urbs(&data->tx_anchor);
-       mtk_data = hci_get_priv(hdev);
 
-       err = btusb_mtk_subsys_reset(hdev, mtk_data->dev_id);
+       err = btusb_mtk_subsys_reset(hdev, btmtk_data->dev_id);
 
        usb_queue_reset_device(data->intf);
        clear_bit(BTUSB_HW_RESET_ACTIVE, &data->flags);
@@ -3195,7 +3194,7 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
        char fw_bin_name[64];
        u32 fw_version = 0, fw_flavor = 0;
        u8 param;
-       struct btmediatek_data *mediatek;
+       struct btmtk_data *mediatek;
 
        calltime = ktime_get();
 
@@ -4423,7 +4422,7 @@ static int btusb_probe(struct usb_interface *intf,
                data->recv_event = btusb_recv_event_realtek;
        } else if (id->driver_info & BTUSB_MEDIATEK) {
                /* Allocate extra space for Mediatek device */
-               priv_size += sizeof(struct btmediatek_data);
+               priv_size += sizeof(struct btmtk_data);
        }
 
        data->recv_acl = hci_recv_frame;