staging: r8188eu: remove IOL_exec_cmds_sync() from struct hal_ops
PATCH v2 1/3 staging: r8188eu: remove IOL_exec_cmds_sync() from struct hal_ops
Remove IOL_exec_cmds_sync() from struct hal_ops and its wrapper rtw_hal_iol_cmd(). Call rtl8188e_IOL_exec_cmds_sync() directly instead.
Signed-off-by Michael Straube <[email protected]>
---
v1 -> v2: no changes
drivers/staging/r8188eu/core/rtw_iol.c | 2 +- drivers/staging/r8188eu/hal/hal_intf.c | 10 ---------- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 4 +--- drivers/staging/r8188eu/include/hal_intf.h | 10 +++------- 4 files changed, 5 insertions(+), 21 deletions(-)
drivers/staging/r8188eu/core/rtw_iol.c +1 -1
@@ -74,7 +74,7 @@ bool rtw_IOL_applied(struct adapter *adapter)int rtw_IOL_exec_cmds_sync (struct adapter *adapter,struct xmit_frame *xmit_frame,u32 max_wating_ms,u32 bndy_cnt) { -return rtw_hal_iol_cmd (adapter, xmit_frame, max_wating_ms, bndy_cnt); +return rtl8188e_IOL_exec_cmds_sync (adapter, xmit_frame, max_wating_ms, bndy_cnt); }int rtw_IOL_append_LLT_cmd (struct xmit_frame *xmit_frame,u8 page_boundary)
drivers/staging/r8188eu/hal/hal_intf.c +0 -10
@@ -177,13 +177,3 @@ void rtw_hal_write_rfreg(struct adapter *adapt, enum rf_radio_path rfpath, adapt->HalFunc.write_rfreg (adapt, rfpath, regaddr, bitmask, data); } - -int rtw_hal_iol_cmd (struct adapter *adapter,struct xmit_frame *xmit_frame, -u32 max_wating_ms,u32 bndy_cnt) -{ -if (adapter->HalFunc.IOL_exec_cmds_sync) -return adapter->HalFunc.IOL_exec_cmds_sync (adapter, xmit_frame, - max_wating_ms, - bndy_cnt); -return _FAIL; -}
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +1 -3
@@ -306,7 +306,7 @@ static s32 iol_ioconfig(struct adapter *padapter, u8 iocfg_bndy)return rst; } -static int rtl8188e_IOL_exec_cmds_sync (struct adapter *adapter,struct xmit_frame *xmit_frame,u32 max_wating_ms,u32 bndy_cnt) +int rtl8188e_IOL_exec_cmds_sync (struct adapter *adapter,struct xmit_frame *xmit_frame,u32 max_wating_ms,u32 bndy_cnt) {struct pkt_attrib *pattrib = &xmit_frame->attrib;u8 i;
@@ -1754,8 +1754,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->write_bbreg = &rtl8188e_PHY_SetBBReg; pHalFunc->read_rfreg = &rtl8188e_PHY_QueryRFReg; pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg; - - pHalFunc->IOL_exec_cmds_sync = &rtl8188e_IOL_exec_cmds_sync; }u8 GetEEPROMSize8188E (struct adapter *padapter)
drivers/staging/r8188eu/include/hal_intf.h +3 -7
@@ -162,10 +162,6 @@ struct hal_ops {void (*write_rfreg)(struct adapter *padapter,enum rf_radio_path eRFPath,u32 RegAddr,u32 BitMask,u32 Data); - -int (*IOL_exec_cmds_sync)(struct adapter *padapter, -struct xmit_frame *frame,u32 max_wait, -u32 bndy_cnt); };#define RF_CHANGE_BY_INIT 0
@@ -204,6 +200,9 @@ void hal_notch_filter_8188e(struct adapter *adapter, bool enable);void SetBeaconRelatedRegisters8188EUsb (struct adapter *adapt);void UpdateHalRAMask8188EUsb (struct adapter *adapt,u32 mac_id,u8 rssi_level); +int rtl8188e_IOL_exec_cmds_sync (struct adapter *adapter, +struct xmit_frame *xmit_frame,u32 max_wating_ms,u32 bndy_cnt); +uint rtw_hal_init (struct adapter *padapter);uint rtw_hal_deinit (struct adapter *padapter);void rtw_hal_stop (struct adapter *padapter);
@@ -240,9 +239,6 @@ void rtw_hal_write_rfreg(struct adapter *padapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask, u32 Data); -int rtw_hal_iol_cmd (struct adapter *adapter,struct xmit_frame *xmit_frame, -u32 max_wating_ms,u32 bndy_cnt); -void indicate_wx_scan_complete_event (struct adapter *padapter);u8 rtw_do_join (struct adapter *padapter);
Signature · 1 line
2.33.0
PATCH v2 2/3 staging: r8188eu: remove wrapper rtw_IOL_exec_cmds_sync()
Function rtw_IOL_exec_cmds_sync() is just a wrapper around rtl8188e_IOL_exec_cmds_sync(). Remove it.
Signed-off-by Michael Straube <[email protected]>
---
v1 -> v2: added missing 'r8188eu:' to commit message
drivers/staging/r8188eu/core/rtw_iol.c | 5 ----- drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 4 ++-- drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 2 +- drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 2 +- drivers/staging/r8188eu/include/rtw_iol.h | 3 --- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 10 +++++----- 6 files changed, 9 insertions(+), 17 deletions(-)
drivers/staging/r8188eu/core/rtw_iol.c +0 -5
@@ -72,11 +72,6 @@ bool rtw_IOL_applied(struct adapter *adapter)return false; } -int rtw_IOL_exec_cmds_sync (struct adapter *adapter,struct xmit_frame *xmit_frame,u32 max_wating_ms,u32 bndy_cnt) -{ -return rtl8188e_IOL_exec_cmds_sync (adapter, xmit_frame, max_wating_ms, bndy_cnt); -} -int rtw_IOL_append_LLT_cmd (struct xmit_frame *xmit_frame,u8 page_boundary) {return _SUCCESS;
drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c +2 -2
@@ -246,7 +246,7 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *dm_odm) } }if (biol) { -if (!rtw_IOL_exec_cmds_sync (dm_odm->Adapter, pxmit_frame,1000 , bndy_cnt)) { +if (!rtl8188e_IOL_exec_cmds_sync (dm_odm->Adapter, pxmit_frame,1000 , bndy_cnt)) {printk ("~~~ %s IOL_exec_cmds Failed !!!\n" , __func__); rst =HAL_STATUS_FAILURE ; }
@@ -557,7 +557,7 @@ enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *dm_odm) } }if (biol) { -if (!rtw_IOL_exec_cmds_sync (dm_odm->Adapter, pxmit_frame,1000 , bndy_cnt)) { +if (!rtl8188e_IOL_exec_cmds_sync (dm_odm->Adapter, pxmit_frame,1000 , bndy_cnt)) { rst =HAL_STATUS_FAILURE ;pr_info ("~~~ IOL Config %s Failed !!!\n" , __func__); }
drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c +1 -1
@@ -204,7 +204,7 @@ enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *dm_odm) } }if (biol) { -if (!rtw_IOL_exec_cmds_sync (dm_odm->Adapter, pxmit_frame,1000 , bndy_cnt)) { +if (!rtl8188e_IOL_exec_cmds_sync (dm_odm->Adapter, pxmit_frame,1000 , bndy_cnt)) {pr_info ("~~~ MAC IOL_exec_cmds Failed !!!\n" ); rst =HAL_STATUS_FAILURE ; }
drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c +1 -1
@@ -241,7 +241,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm) } }if (biol) { -if (!rtw_IOL_exec_cmds_sync (pDM_Odm->Adapter, pxmit_frame,1000 , bndy_cnt)) { +if (!rtl8188e_IOL_exec_cmds_sync (pDM_Odm->Adapter, pxmit_frame,1000 , bndy_cnt)) { rst =HAL_STATUS_FAILURE ;pr_info ("~~~ IOL Config %s Failed !!!\n" , __func__); }
drivers/staging/r8188eu/include/rtw_iol.h +0 -3
@@ -34,9 +34,6 @@ struct xmit_frame *rtw_IOL_accquire_xmit_frame(struct adapter *adapter);int rtw_IOL_append_cmds (struct xmit_frame *xmit_frame,u8 *IOL_cmds,u32 cmd_len);int rtw_IOL_append_LLT_cmd (struct xmit_frame *xmit_frame,u8 page_boundary); -int rtw_IOL_exec_cmds_sync (struct adapter *adapter, -struct xmit_frame *xmit_frame,u32 max_wating_ms, -u32 bndy_cnt);bool rtw_IOL_applied (struct adapter *adapter);int rtw_IOL_append_DELAY_US_cmd (struct xmit_frame *xmit_frame,u16 us);int rtw_IOL_append_DELAY_MS_cmd (struct xmit_frame *xmit_frame,u16 ms);
drivers/staging/r8188eu/os_dep/ioctl_linux.c +5 -5
@@ -4032,7 +4032,7 @@ static int rtw_dbg_port(struct net_device *dev,rtw_IOL_append_LLT_cmd (xmit_frame, page_boundary); -if (_SUCCESS !=rtw_IOL_exec_cmds_sync (padapter, xmit_frame,500 ,0 )) +if (rtl8188e_IOL_exec_cmds_sync (padapter, xmit_frame,500 ,0 ) != _SUCCESS) ret = -EPERM ; }break ;
@@ -4056,7 +4056,7 @@ static int rtw_dbg_port(struct net_device *dev,rtw_IOL_append_WB_cmd (xmit_frame, reg,0x08 ,0xff );rtw_IOL_append_DELAY_MS_cmd (xmit_frame, blink_delay_ms); } -if (_SUCCESS !=rtw_IOL_exec_cmds_sync (padapter, xmit_frame, (blink_delay_ms * blink_num *2 ) +200 ,0 )) +if (rtl8188e_IOL_exec_cmds_sync (padapter, xmit_frame, (blink_delay_ms * blink_num *2 ) +200 ,0 ) != _SUCCESS) ret = -EPERM ; }break ;
@@ -4078,7 +4078,7 @@ static int rtw_dbg_port(struct net_device *dev,for (i =0 ; i < write_num; i++)rtw_IOL_append_WB_cmd (xmit_frame, reg, i + start_value,0xFF ); -if (_SUCCESS !=rtw_IOL_exec_cmds_sync (padapter, xmit_frame,5000 ,0 )) +if (rtl8188e_IOL_exec_cmds_sync (padapter, xmit_frame,5000 ,0 ) != _SUCCESS) ret = -EPERM ; final =rtw_read8 (padapter, reg);
@@ -4107,7 +4107,7 @@ static int rtw_dbg_port(struct net_device *dev,for (i =0 ; i < write_num; i++)rtw_IOL_append_WW_cmd (xmit_frame, reg, i + start_value,0xFFFF ); -if (_SUCCESS !=rtw_IOL_exec_cmds_sync (padapter, xmit_frame,5000 ,0 )) +if (rtl8188e_IOL_exec_cmds_sync (padapter, xmit_frame,5000 ,0 ) != _SUCCESS) ret = -EPERM ; final =rtw_read16 (padapter, reg);
@@ -4135,7 +4135,7 @@ static int rtw_dbg_port(struct net_device *dev,for (i =0 ; i < write_num; i++)rtw_IOL_append_WD_cmd (xmit_frame, reg, i + start_value,0xFFFFFFFF ); -if (_SUCCESS !=rtw_IOL_exec_cmds_sync (padapter, xmit_frame,5000 ,0 )) +if (rtl8188e_IOL_exec_cmds_sync (padapter, xmit_frame,5000 ,0 ) != _SUCCESS) ret = -EPERM ; final =rtw_read32 (padapter, reg);
Signature · 1 line
2.33.0
PATCH v2 3/3 staging: r8188eu: remove rtw_IOL_append_LLT_cmd()
In reply to Michael StraubeFunction rtw_IOL_append_LLT_cmd() just returns _SUCCESS and the only caller does not use the return value. Remove it.
Signed-off-by Michael Straube <[email protected]>
---
v1 -> v2: no changes
drivers/staging/r8188eu/core/rtw_iol.c | 5 ----- drivers/staging/r8188eu/include/rtw_iol.h | 1 - drivers/staging/r8188eu/os_dep/ioctl_linux.c | 3 --- 3 files changed, 9 deletions(-)
drivers/staging/r8188eu/core/rtw_iol.c +0 -5
@@ -72,11 +72,6 @@ bool rtw_IOL_applied(struct adapter *adapter)return false; } -int rtw_IOL_append_LLT_cmd (struct xmit_frame *xmit_frame,u8 page_boundary) -{ -return _SUCCESS; -} -int _rtw_IOL_append_WB_cmd (struct xmit_frame *xmit_frame,u16 addr,u8 value,u8 mask) {struct ioreg_cfg cmd = {8 ,IOREG_CMD_WB_REG ,0x0 ,0x0 ,0x0 };
drivers/staging/r8188eu/include/rtw_iol.h +0 -1
@@ -33,7 +33,6 @@ enum ioreg_cmd {struct xmit_frame *rtw_IOL_accquire_xmit_frame (struct adapter *adapter);int rtw_IOL_append_cmds (struct xmit_frame *xmit_frame,u8 *IOL_cmds,u32 cmd_len); -int rtw_IOL_append_LLT_cmd (struct xmit_frame *xmit_frame,u8 page_boundary);bool rtw_IOL_applied (struct adapter *adapter);int rtw_IOL_append_DELAY_US_cmd (struct xmit_frame *xmit_frame,u16 us);int rtw_IOL_append_DELAY_MS_cmd (struct xmit_frame *xmit_frame,u16 ms);
drivers/staging/r8188eu/os_dep/ioctl_linux.c +0 -3
@@ -4021,7 +4021,6 @@ static int rtw_dbg_port(struct net_device *dev,switch (minor_cmd) {case 0x04 :/* LLT table initialization test */ { -u8 page_boundary =0xf9 ;struct xmit_frame *xmit_frame; xmit_frame =rtw_IOL_accquire_xmit_frame (padapter);
@@ -4030,8 +4029,6 @@ static int rtw_dbg_port(struct net_device *dev,break ; } -rtw_IOL_append_LLT_cmd (xmit_frame, page_boundary); -if (rtl8188e_IOL_exec_cmds_sync (padapter, xmit_frame,500 ,0 ) != _SUCCESS) ret = -EPERM ; }
Signature · 1 line
2.33.0