Commit 8d8fe46c authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo

wifi: rtw89: coex: use void pointer as temporal type to copy report

With void pointer, we don't need to cast to 'u8 *' by one by.
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220913092546.43722-2-pkshih@realtek.com
parent 4302b3fb
...@@ -916,7 +916,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -916,7 +916,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
struct rtw89_btc_fbtc_cysta_cpu pcysta[1]; struct rtw89_btc_fbtc_cysta_cpu pcysta[1];
struct rtw89_btc_prpt *btc_prpt = NULL; struct rtw89_btc_prpt *btc_prpt = NULL;
struct rtw89_btc_fbtc_slot *rtp_slot = NULL; struct rtw89_btc_fbtc_slot *rtp_slot = NULL;
u8 rpt_type = 0, *rpt_content = NULL, *pfinfo = NULL; void *rpt_content = NULL, *pfinfo = NULL;
u8 rpt_type = 0;
u16 wl_slot_set = 0, wl_slot_real = 0; u16 wl_slot_set = 0, wl_slot_real = 0;
u32 trace_step = btc->ctrl.trace_step, rpt_len = 0, diff_t; u32 trace_step = btc->ctrl.trace_step, rpt_len = 0, diff_t;
u32 cnt_leak_slot = 0, bt_slot_real = 0, cnt_rx_imr = 0; u32 cnt_leak_slot = 0, bt_slot_real = 0, cnt_rx_imr = 0;
...@@ -944,10 +945,10 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -944,10 +945,10 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
case BTC_RPT_TYPE_CTRL: case BTC_RPT_TYPE_CTRL:
pcinfo = &pfwinfo->rpt_ctrl.cinfo; pcinfo = &pfwinfo->rpt_ctrl.cinfo;
if (chip->chip_id == RTL8852A) { if (chip->chip_id == RTL8852A) {
pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo); pfinfo = &pfwinfo->rpt_ctrl.finfo;
pcinfo->req_len = sizeof(pfwinfo->rpt_ctrl.finfo); pcinfo->req_len = sizeof(pfwinfo->rpt_ctrl.finfo);
} else { } else {
pfinfo = (u8 *)(&pfwinfo->rpt_ctrl.finfo_v1); pfinfo = &pfwinfo->rpt_ctrl.finfo_v1;
pcinfo->req_len = sizeof(pfwinfo->rpt_ctrl.finfo_v1); pcinfo->req_len = sizeof(pfwinfo->rpt_ctrl.finfo_v1);
} }
pcinfo->req_fver = chip->fcxbtcrpt_ver; pcinfo->req_fver = chip->fcxbtcrpt_ver;
...@@ -957,10 +958,10 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -957,10 +958,10 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
case BTC_RPT_TYPE_TDMA: case BTC_RPT_TYPE_TDMA:
pcinfo = &pfwinfo->rpt_fbtc_tdma.cinfo; pcinfo = &pfwinfo->rpt_fbtc_tdma.cinfo;
if (chip->chip_id == RTL8852A) { if (chip->chip_id == RTL8852A) {
pfinfo = (u8 *)&pfwinfo->rpt_fbtc_tdma.finfo; pfinfo = &pfwinfo->rpt_fbtc_tdma.finfo;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_tdma.finfo); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_tdma.finfo);
} else { } else {
pfinfo = (u8 *)&pfwinfo->rpt_fbtc_tdma.finfo_v1; pfinfo = &pfwinfo->rpt_fbtc_tdma.finfo_v1;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_tdma.finfo_v1); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_tdma.finfo_v1);
} }
pcinfo->req_fver = chip->fcxtdma_ver; pcinfo->req_fver = chip->fcxtdma_ver;
...@@ -969,7 +970,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -969,7 +970,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
break; break;
case BTC_RPT_TYPE_SLOT: case BTC_RPT_TYPE_SLOT:
pcinfo = &pfwinfo->rpt_fbtc_slots.cinfo; pcinfo = &pfwinfo->rpt_fbtc_slots.cinfo;
pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_slots.finfo); pfinfo = &pfwinfo->rpt_fbtc_slots.finfo;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_slots.finfo); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_slots.finfo);
pcinfo->req_fver = chip->fcxslots_ver; pcinfo->req_fver = chip->fcxslots_ver;
pcinfo->rx_len = rpt_len; pcinfo->rx_len = rpt_len;
...@@ -978,12 +979,12 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -978,12 +979,12 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
case BTC_RPT_TYPE_CYSTA: case BTC_RPT_TYPE_CYSTA:
pcinfo = &pfwinfo->rpt_fbtc_cysta.cinfo; pcinfo = &pfwinfo->rpt_fbtc_cysta.cinfo;
if (chip->chip_id == RTL8852A) { if (chip->chip_id == RTL8852A) {
pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_cysta.finfo); pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo;
pcysta_le32 = &pfwinfo->rpt_fbtc_cysta.finfo; pcysta_le32 = &pfwinfo->rpt_fbtc_cysta.finfo;
rtw89_btc_fbtc_cysta_to_cpu(pcysta_le32, pcysta); rtw89_btc_fbtc_cysta_to_cpu(pcysta_le32, pcysta);
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_cysta.finfo); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_cysta.finfo);
} else { } else {
pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_cysta.finfo_v1); pfinfo = &pfwinfo->rpt_fbtc_cysta.finfo_v1;
pcysta_v1 = &pfwinfo->rpt_fbtc_cysta.finfo_v1; pcysta_v1 = &pfwinfo->rpt_fbtc_cysta.finfo_v1;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_cysta.finfo_v1); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_cysta.finfo_v1);
} }
...@@ -993,7 +994,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -993,7 +994,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
break; break;
case BTC_RPT_TYPE_STEP: case BTC_RPT_TYPE_STEP:
pcinfo = &pfwinfo->rpt_fbtc_step.cinfo; pcinfo = &pfwinfo->rpt_fbtc_step.cinfo;
pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_step.finfo); pfinfo = &pfwinfo->rpt_fbtc_step.finfo;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_step.finfo.step[0]) * pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_step.finfo.step[0]) *
trace_step + 8; trace_step + 8;
pcinfo->req_fver = chip->fcxstep_ver; pcinfo->req_fver = chip->fcxstep_ver;
...@@ -1002,7 +1003,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -1002,7 +1003,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
break; break;
case BTC_RPT_TYPE_NULLSTA: case BTC_RPT_TYPE_NULLSTA:
pcinfo = &pfwinfo->rpt_fbtc_nullsta.cinfo; pcinfo = &pfwinfo->rpt_fbtc_nullsta.cinfo;
pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_nullsta.finfo); pfinfo = &pfwinfo->rpt_fbtc_nullsta.finfo;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_nullsta.finfo); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_nullsta.finfo);
pcinfo->req_fver = chip->fcxnullsta_ver; pcinfo->req_fver = chip->fcxnullsta_ver;
pcinfo->rx_len = rpt_len; pcinfo->rx_len = rpt_len;
...@@ -1010,7 +1011,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -1010,7 +1011,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
break; break;
case BTC_RPT_TYPE_MREG: case BTC_RPT_TYPE_MREG:
pcinfo = &pfwinfo->rpt_fbtc_mregval.cinfo; pcinfo = &pfwinfo->rpt_fbtc_mregval.cinfo;
pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_mregval.finfo); pfinfo = &pfwinfo->rpt_fbtc_mregval.finfo;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_mregval.finfo); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_mregval.finfo);
pcinfo->req_fver = chip->fcxmreg_ver; pcinfo->req_fver = chip->fcxmreg_ver;
pcinfo->rx_len = rpt_len; pcinfo->rx_len = rpt_len;
...@@ -1018,7 +1019,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -1018,7 +1019,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
break; break;
case BTC_RPT_TYPE_GPIO_DBG: case BTC_RPT_TYPE_GPIO_DBG:
pcinfo = &pfwinfo->rpt_fbtc_gpio_dbg.cinfo; pcinfo = &pfwinfo->rpt_fbtc_gpio_dbg.cinfo;
pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_gpio_dbg.finfo); pfinfo = &pfwinfo->rpt_fbtc_gpio_dbg.finfo;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_gpio_dbg.finfo); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_gpio_dbg.finfo);
pcinfo->req_fver = chip->fcxgpiodbg_ver; pcinfo->req_fver = chip->fcxgpiodbg_ver;
pcinfo->rx_len = rpt_len; pcinfo->rx_len = rpt_len;
...@@ -1026,7 +1027,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -1026,7 +1027,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
break; break;
case BTC_RPT_TYPE_BT_VER: case BTC_RPT_TYPE_BT_VER:
pcinfo = &pfwinfo->rpt_fbtc_btver.cinfo; pcinfo = &pfwinfo->rpt_fbtc_btver.cinfo;
pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_btver.finfo); pfinfo = &pfwinfo->rpt_fbtc_btver.finfo;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_btver.finfo); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_btver.finfo);
pcinfo->req_fver = chip->fcxbtver_ver; pcinfo->req_fver = chip->fcxbtver_ver;
pcinfo->rx_len = rpt_len; pcinfo->rx_len = rpt_len;
...@@ -1034,7 +1035,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -1034,7 +1035,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
break; break;
case BTC_RPT_TYPE_BT_SCAN: case BTC_RPT_TYPE_BT_SCAN:
pcinfo = &pfwinfo->rpt_fbtc_btscan.cinfo; pcinfo = &pfwinfo->rpt_fbtc_btscan.cinfo;
pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_btscan.finfo); pfinfo = &pfwinfo->rpt_fbtc_btscan.finfo;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_btscan.finfo); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_btscan.finfo);
pcinfo->req_fver = chip->fcxbtscan_ver; pcinfo->req_fver = chip->fcxbtscan_ver;
pcinfo->rx_len = rpt_len; pcinfo->rx_len = rpt_len;
...@@ -1042,7 +1043,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -1042,7 +1043,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
break; break;
case BTC_RPT_TYPE_BT_AFH: case BTC_RPT_TYPE_BT_AFH:
pcinfo = &pfwinfo->rpt_fbtc_btafh.cinfo; pcinfo = &pfwinfo->rpt_fbtc_btafh.cinfo;
pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_btafh.finfo); pfinfo = &pfwinfo->rpt_fbtc_btafh.finfo;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_btafh.finfo); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_btafh.finfo);
pcinfo->req_fver = chip->fcxbtafh_ver; pcinfo->req_fver = chip->fcxbtafh_ver;
pcinfo->rx_len = rpt_len; pcinfo->rx_len = rpt_len;
...@@ -1050,7 +1051,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev, ...@@ -1050,7 +1051,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
break; break;
case BTC_RPT_TYPE_BT_DEVICE: case BTC_RPT_TYPE_BT_DEVICE:
pcinfo = &pfwinfo->rpt_fbtc_btdev.cinfo; pcinfo = &pfwinfo->rpt_fbtc_btdev.cinfo;
pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_btdev.finfo); pfinfo = &pfwinfo->rpt_fbtc_btdev.finfo;
pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_btdev.finfo); pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_btdev.finfo);
pcinfo->req_fver = chip->fcxbtdevinfo_ver; pcinfo->req_fver = chip->fcxbtdevinfo_ver;
pcinfo->rx_len = rpt_len; pcinfo->rx_len = rpt_len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment