From: Sean Wang <sean.wang@mediatek.com>
Date: Mon, 10 Jan 2022 03:24:00 +0800
Subject: Bluetooth: btmtksdio: move struct reg_read_cmd to common file
Patch-mainline: v5.18-rc1
Git-commit: 5677bcf6d8ff645d90c422ab035030c6aeec9296
References: jsc#PED-1407
move struct reg_read_cmd to btmtk.h to allow other mtk drivers refer to.
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Lee, Chun-Yi <jlee@suse.com>
---
drivers/bluetooth/btmtk.h | 7 +++++++
drivers/bluetooth/btmtksdio.c | 7 +------
2 files changed, 8 insertions(+), 6 deletions(-)
--- a/drivers/bluetooth/btmtk.h
+++ b/drivers/bluetooth/btmtk.h
@@ -87,6 +87,13 @@ struct btmtk_sco {
u8 channel_select_config;
} __packed;
+struct reg_read_cmd {
+ u8 type;
+ u8 rsv;
+ u8 num;
+ __le32 addr;
+} __packed;
+
struct reg_write_cmd {
u8 type;
u8 rsv;
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -800,12 +800,7 @@ static int mt79xx_setup(struct hci_dev *
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 {
- u8 type;
- u8 rsv;
- u8 num;
- __le32 addr;
- } __packed reg_read = {
+ struct reg_read_cmd reg_read = {
.type = 1,
.num = 1,
};