[v5,1/5] Bluetooth: btmtksdio: rename btsdio_mtk_reg_read

Commit Message

Sean Wang Jan. 9, 2022, 7:23 p.m. UTC

From: Sean Wang <[e-mail]>

Using "btmtksdio" as the prefix instead of "btsdio"

Signed-off-by: Sean Wang <[e-mail]>
---
v5: new created to make the series better
---
 drivers/bluetooth/btmtksdio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Marcel Holtmann Jan. 9, 2022, 7:36 p.m. UTC | #1

Hi Sean,

> Using "btmtksdio" as the prefix instead of "btsdio"
> 
> Signed-off-by: Sean Wang <[e-mail]>
> ---
> v5: new created to make the series better
> ---
> drivers/bluetooth/btmtksdio.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)

all 5 patches have been applied to bluetooth-next tree.

Regards

Marcel

Patch

diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index b5ea8d3bffaa..891e34b50e44 100644
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -797,7 +797,7 @@  static int mt79xx_setup(struct hci_dev *hdev, const char *fwname)
 	return err;
 }
 
-static int btsdio_mtk_reg_read(struct hci_dev *hdev, u32 reg, u32 *val)
+static int btmtksdio_mtk_reg_read(struct hci_dev *hdev, u32 reg, u32 *val)
 {
 	struct btmtk_hci_wmt_params wmt_params;
 	struct reg_read_cmd {
@@ -844,13 +844,13 @@  static int btmtksdio_setup(struct hci_dev *hdev)
 
 	switch (bdev->data->chipid) {
 	case 0x7921:
-		err = btsdio_mtk_reg_read(hdev, 0x70010200, &dev_id);
+		err = btmtksdio_mtk_reg_read(hdev, 0x70010200, &dev_id);
 		if (err < 0) {
 			bt_dev_err(hdev, "Failed to get device id (%d)", err);
 			return err;
 		}
 
-		err = btsdio_mtk_reg_read(hdev, 0x80021004, &fw_version);
+		err = btmtksdio_mtk_reg_read(hdev, 0x80021004, &fw_version);
 		if (err < 0) {
 			bt_dev_err(hdev, "Failed to get fw version (%d)", err);
 			return err;