staging: r8188eu: remove struct hal_ops
cover staging: r8188eu: remove struct hal_ops
This series removes the remaining pointers from struct hal_ops and the struct itself.
Note that I sent the first two patches separately yesterday, so this series makes the separately sent patches obsolete.
Tested with Inter-Tech DMG-02 on x86_64.
Michael Straube (5):
staging: r8188eu: remove SetHwRegHandler from hal_ops
staging: r8188eu: remove GetHwRegHandler from hal_ops
staging: r8188eu: remove hal_init from hal_ops
staging: r8188eu: remove hal_ops
staging: r8188eu: rename rtl8188eu_set_hal_ops()
drivers/staging/r8188eu/core/rtw_ap.c | 2 +- drivers/staging/r8188eu/core/rtw_cmd.c | 12 +-- drivers/staging/r8188eu/core/rtw_ioctl_set.c | 2 +- drivers/staging/r8188eu/core/rtw_mlme.c | 13 ++-- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 73 ++++++++----------- drivers/staging/r8188eu/core/rtw_p2p.c | 16 ++-- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 6 +- drivers/staging/r8188eu/core/rtw_wlan_util.c | 44 +++++------ drivers/staging/r8188eu/hal/hal_com.c | 3 +- drivers/staging/r8188eu/hal/hal_intf.c | 16 +--- drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 6 +- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 2 +- .../staging/r8188eu/hal/rtl8188e_hal_init.c | 8 +- drivers/staging/r8188eu/hal/usb_halinit.c | 18 ++--- drivers/staging/r8188eu/include/drv_types.h | 1 - drivers/staging/r8188eu/include/hal_intf.h | 20 ++--- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 6 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- drivers/staging/r8188eu/os_dep/usb_intf.c | 4 +- 19 files changed, 106 insertions(+), 148 deletions(-)
Signature · 1 line
2.33.0
PATCH 1/5 staging: r8188eu: remove SetHwRegHandler from hal_ops
Remove SetHwRegHandler from struct hal_ops and remove the wrapper rtw_hal_set_hwreg(). Call SetHwReg8188EU() directly instead.
--- drivers/staging/r8188eu/core/rtw_cmd.c | 8 +-- drivers/staging/r8188eu/core/rtw_mlme.c | 11 ++- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 69 ++++++++----------- drivers/staging/r8188eu/core/rtw_p2p.c | 16 ++--- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 4 +- drivers/staging/r8188eu/core/rtw_wlan_util.c | 42 +++++------ drivers/staging/r8188eu/hal/hal_com.c | 3 +- drivers/staging/r8188eu/hal/hal_intf.c | 6 -- drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 4 +- .../staging/r8188eu/hal/rtl8188e_hal_init.c | 4 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 +- drivers/staging/r8188eu/include/hal_intf.h | 5 +- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 14 files changed, 78 insertions(+), 101 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +4 -4
@@ -1003,12 +1003,12 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) mstatus =1 ;/* connect */ /* Reset LPS Setting */ padapter->pwrctrlpriv.LpsIdleCount =0 ; -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_JOINBSSRPT , (u8 *)(&mstatus)); +SetHwReg8188EU (padapter,HW_VAR_H2C_FW_JOINBSSRPT , (u8 *)(&mstatus));break ;case LPS_CTRL_DISCONNECT : mstatus =0 ;/* disconnect */ LPS_Leave (padapter); -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_JOINBSSRPT , (u8 *)(&mstatus)); +SetHwReg8188EU (padapter,HW_VAR_H2C_FW_JOINBSSRPT , (u8 *)(&mstatus));break ;case LPS_CTRL_SPECIAL_PACKET :/* DBG_88E("LPS_CTRL_SPECIAL_PACKET\n"); */
@@ -1068,7 +1068,7 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)static void rpt_timer_setting_wk_hdl (struct adapter *padapter,u16 min_time) { -rtw_hal_set_hwreg (padapter,HW_VAR_RPT_TIMER_SETTING , (u8 *)(&min_time)); +SetHwReg8188EU (padapter,HW_VAR_RPT_TIMER_SETTING , (u8 *)(&min_time)); }u8 rtw_rpt_timer_cfg_cmd (struct adapter *padapter,u16 min_time)
@@ -1105,7 +1105,7 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time)static void antenna_select_wk_hdl (struct adapter *padapter,u8 antenna) { -rtw_hal_set_hwreg (padapter,HW_VAR_ANTENNA_DIVERSITY_SELECT , (u8 *)(&antenna)); +SetHwReg8188EU (padapter,HW_VAR_ANTENNA_DIVERSITY_SELECT , (u8 *)(&antenna)); }u8 rtw_antenna_select_cmd (struct adapter *padapter,u8 antenna,u8 enqueue)
drivers/staging/r8188eu/core/rtw_mlme.c +5 -6
@@ -1162,11 +1162,10 @@ void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *psta,return ; macid =search_max_mac_id (adapter); -rtw_hal_set_hwreg (adapter,HW_VAR_TX_RPT_MAX_MACID , (u8 *)&macid); +SetHwReg8188EU (adapter,HW_VAR_TX_RPT_MAX_MACID , (u8 *)&macid);/* MACID|OPMODE:1 connect */ media_status_rpt = (u16)((psta->mac_id <<8 ) | mstatus); -rtw_hal_set_hwreg (adapter,HW_VAR_H2C_MEDIA_STATUS_RPT , - (u8 *)&media_status_rpt); +SetHwReg8188EU (adapter,HW_VAR_H2C_MEDIA_STATUS_RPT , (u8 *)&media_status_rpt); }void rtw_stassoc_event_callback (struct adapter *adapter,u8 *pbuf)
@@ -1246,7 +1245,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)u16 media_status; media_status = (mac_id <<8 ) |0 ;/* MACID|OPMODE:0 means disconnect */ /* for STA, AP, ADHOC mode, report disconnect stauts to FW */ -rtw_hal_set_hwreg (adapter,HW_VAR_H2C_MEDIA_STATUS_RPT , (u8 *)&media_status); +SetHwReg8188EU (adapter,HW_VAR_H2C_MEDIA_STATUS_RPT , (u8 *)&media_status); }if (check_fwstate (pmlmepriv,WIFI_AP_STATE ))
@@ -1880,10 +1879,10 @@ void rtw_joinbss_reset(struct adapter *padapter) threshold =1 ; else threshold =0 ; -rtw_hal_set_hwreg (padapter,HW_VAR_RXDMA_AGG_PG_TH , (u8 *)(&threshold)); +SetHwReg8188EU (padapter,HW_VAR_RXDMA_AGG_PG_TH , (u8 *)(&threshold)); }else { threshold =1 ; -rtw_hal_set_hwreg (padapter,HW_VAR_RXDMA_AGG_PG_TH , (u8 *)(&threshold)); +SetHwReg8188EU (padapter,HW_VAR_RXDMA_AGG_PG_TH , (u8 *)(&threshold)); } }
drivers/staging/r8188eu/core/rtw_mlme_ext.c +28 -41
212 lines not on this page · raw message
drivers/staging/r8188eu/core/rtw_p2p.c +8 -8
@@ -1485,7 +1485,7 @@ static void pre_tx_invitereq_handler(struct adapter *padapter)u8 val8 =1 ;set_channel_bwmode (padapter, pwdinfo->invitereq_info.peer_ch,HAL_PRIME_CHNL_OFFSET_DONT_CARE ,HT_CHANNEL_WIDTH_20 ); - padapter->HalFunc.SetHwRegHandler (padapter,HW_VAR_MLME_SITESURVEY , (u8 *)(&val8)); +SetHwReg8188EU (padapter,HW_VAR_MLME_SITESURVEY , (u8 *)(&val8));issue_probereq_p2p (padapter,NULL );_set_timer (&pwdinfo->pre_tx_scan_timer,P2P_TX_PRESCAN_TIMEOUT );
@@ -1497,7 +1497,7 @@ static void pre_tx_provdisc_handler(struct adapter *padapter)u8 val8 =1 ;set_channel_bwmode (padapter, pwdinfo->tx_prov_disc_info.peer_channel_num[0 ],HAL_PRIME_CHNL_OFFSET_DONT_CARE ,HT_CHANNEL_WIDTH_20 ); -rtw_hal_set_hwreg (padapter,HW_VAR_MLME_SITESURVEY , (u8 *)(&val8)); +SetHwReg8188EU (padapter,HW_VAR_MLME_SITESURVEY , (u8 *)(&val8));issue_probereq_p2p (padapter,NULL );_set_timer (&pwdinfo->pre_tx_scan_timer,P2P_TX_PRESCAN_TIMEOUT );
@@ -1509,7 +1509,7 @@ static void pre_tx_negoreq_handler(struct adapter *padapter)u8 val8 =1 ;set_channel_bwmode (padapter, pwdinfo->nego_req_info.peer_channel_num[0 ],HAL_PRIME_CHNL_OFFSET_DONT_CARE ,HT_CHANNEL_WIDTH_20 ); -rtw_hal_set_hwreg (padapter,HW_VAR_MLME_SITESURVEY , (u8 *)(&val8)); +SetHwReg8188EU (padapter,HW_VAR_MLME_SITESURVEY , (u8 *)(&val8));issue_probereq_p2p (padapter,NULL );_set_timer (&pwdinfo->pre_tx_scan_timer,P2P_TX_PRESCAN_TIMEOUT );
@@ -1634,7 +1634,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)case P2P_PS_DISABLE : pwdinfo->p2p_ps_state = p2p_ps_state; -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_P2P_PS_OFFLOAD , (u8 *)(&p2p_ps_state)); +SetHwReg8188EU (padapter,HW_VAR_H2C_FW_P2P_PS_OFFLOAD , (u8 *)(&p2p_ps_state)); pwdinfo->noa_index =0 ; pwdinfo->ctwindow =0 ;
@@ -1644,7 +1644,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)if (padapter->pwrctrlpriv.bFwCurrentInPSMode) {if (pwrpriv->smart_ps ==0 ) { pwrpriv->smart_ps =2 ; -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&padapter->pwrctrlpriv.pwr_mode)); +SetHwReg8188EU (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&padapter->pwrctrlpriv.pwr_mode)); } }break ;
@@ -1656,10 +1656,10 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)if (pwrpriv->smart_ps !=0 ) { pwrpriv->smart_ps =0 ;DBG_88E ("%s(): Enter CTW, change SmartPS\n" , __func__); -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&padapter->pwrctrlpriv.pwr_mode)); +SetHwReg8188EU (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&padapter->pwrctrlpriv.pwr_mode)); } } -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_P2P_PS_OFFLOAD , (u8 *)(&p2p_ps_state)); +SetHwReg8188EU (padapter,HW_VAR_H2C_FW_P2P_PS_OFFLOAD , (u8 *)(&p2p_ps_state)); }break ;case P2P_PS_SCAN :
@@ -1667,7 +1667,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)case P2P_PS_ALLSTASLEEP :if (pwdinfo->p2p_ps_mode >P2P_PS_NONE ) { pwdinfo->p2p_ps_state = p2p_ps_state; -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_P2P_PS_OFFLOAD , (u8 *)(&p2p_ps_state)); +SetHwReg8188EU (padapter,HW_VAR_H2C_FW_P2P_PS_OFFLOAD , (u8 *)(&p2p_ps_state)); }break ;default :
drivers/staging/r8188eu/core/rtw_pwrctrl.c +2 -2
@@ -212,7 +212,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_aif (pwdinfo->opp_ps ==0 ) {DBG_88E ("rtw_set_ps_mode: Leave 802.11 power save\n" ); pwrpriv->pwr_mode = ps_mode; -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&ps_mode)); +SetHwReg8188EU (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&ps_mode)); pwrpriv->bFwCurrentInPSMode = false; } }else {
@@ -222,7 +222,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a pwrpriv->pwr_mode = ps_mode; pwrpriv->smart_ps = smart_ps; pwrpriv->bcn_ant_mode = bcn_ant_mode; -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&ps_mode)); +SetHwReg8188EU (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&ps_mode));/* Set CTWindow after LPS */ if (pwdinfo->opp_ps ==1 )
drivers/staging/r8188eu/core/rtw_wlan_util.c +21 -21
147 lines not on this page · raw message
drivers/staging/r8188eu/hal/hal_com.c +1 -2
@@ -281,8 +281,7 @@ bool Hal_MappingOutPipe(struct adapter *adapter, u8 numoutpipe)void hal_init_macaddr (struct adapter *adapter) { -rtw_hal_set_hwreg (adapter,HW_VAR_MAC_ADDR , - adapter->eeprompriv.mac_addr); +SetHwReg8188EU (adapter,HW_VAR_MAC_ADDR , adapter->eeprompriv.mac_addr); }/*
drivers/staging/r8188eu/hal/hal_intf.c +0 -6
@@ -41,12 +41,6 @@ uint rtw_hal_deinit(struct adapter *adapt)return status; } -void rtw_hal_set_hwreg (struct adapter *adapt,u8 variable,u8 *val) -{ -if (adapt->HalFunc.SetHwRegHandler) - adapt->HalFunc.SetHwRegHandler (adapt, variable, val); -} -void rtw_hal_get_hwreg (struct adapter *adapt,u8 variable,u8 *val) {if (adapt->HalFunc.GetHwRegHandler)
drivers/staging/r8188eu/hal/rtl8188e_cmd.c +2 -2
@@ -593,7 +593,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus) haldata->RegFwHwTxQCtrl &= (~BIT (6 ));/* Clear beacon valid check bit. */ -rtw_hal_set_hwreg (adapt,HW_VAR_BCN_VALID ,NULL ); +SetHwReg8188EU (adapt,HW_VAR_BCN_VALID ,NULL ); DLBcnCount =0 ; poll =0 ; do {
@@ -638,7 +638,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)/* Update RSVD page location H2C to Fw. */ if (bcn_valid) { -rtw_hal_set_hwreg (adapt,HW_VAR_BCN_VALID ,NULL ); +SetHwReg8188EU (adapt,HW_VAR_BCN_VALID ,NULL );DBG_88E ("Set RSVD page location to Fw.\n" ); }
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +2 -2
@@ -845,7 +845,7 @@ static void Hal_EfuseReadEFuse88E(struct adapter *Adapter, pbuf[i] = efuseTbl[_offset + i];/* 5. Calculate Efuse utilization. */ -rtw_hal_set_hwreg (Adapter,HW_VAR_EFUSE_BYTES , (u8 *)&eFuse_Addr); +SetHwReg8188EU (Adapter,HW_VAR_EFUSE_BYTES , (u8 *)&eFuse_Addr); exit:kfree (efuseTbl);
@@ -1131,7 +1131,7 @@ static u16 hal_EfuseGetCurrentSize_8188e(struct adapter *pAdapter, bool bPseudoTif (bPseudoTest) fakeEfuseUsedBytes = efuse_addr;else -rtw_hal_set_hwreg (pAdapter,HW_VAR_EFUSE_BYTES , (u8 *)&efuse_addr); +SetHwReg8188EU (pAdapter,HW_VAR_EFUSE_BYTES , (u8 *)&efuse_addr);return efuse_addr; }
drivers/staging/r8188eu/hal/usb_halinit.c +1 -2
@@ -1277,7 +1277,7 @@ static void hw_var_set_bcn_func(struct adapter *Adapter, u8 variable, u8 *val)rtw_write8 (Adapter, bcn_ctrl_reg,rtw_read8 (Adapter, bcn_ctrl_reg) & (~(EN_BCN_FUNCTION |EN_TXBCN_RPT ))); } -static void SetHwReg8188EU (struct adapter *Adapter,u8 variable,u8 *val) +void SetHwReg8188EU (struct adapter *Adapter,u8 variable,u8 *val) {struct hal_data_8188e *haldata =GET_HAL_DATA (Adapter);struct dm_priv *pdmpriv = &haldata->dmpriv;
@@ -2143,6 +2143,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) halfunc->hal_init = &rtl8188eu_hal_init; halfunc->hal_deinit = &rtl8188eu_hal_deinit; - halfunc->SetHwRegHandler = &SetHwReg8188EU; halfunc->GetHwRegHandler = &GetHwReg8188EU; }
drivers/staging/r8188eu/include/hal_intf.h +2 -3
@@ -125,8 +125,6 @@ struct hal_ops {u32 (*hal_init)(struct adapter *padapter);u32 (*hal_deinit)(struct adapter *padapter); -void (*SetHwRegHandler)(struct adapter *padapter,u8 variable, -u8 *val);void (*GetHwRegHandler)(struct adapter *padapter,u8 variable,u8 *val); };
@@ -173,10 +171,11 @@ u8 GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariableunsigned int rtl8188eu_inirp_init (struct adapter *Adapter); +void SetHwReg8188EU (struct adapter *Adapter,u8 variable,u8 *val); +uint rtw_hal_init (struct adapter *padapter);uint rtw_hal_deinit (struct adapter *padapter);void rtw_hal_stop (struct adapter *padapter); -void rtw_hal_set_hwreg (struct adapter *padapter,u8 variable,u8 *val);void rtw_hal_get_hwreg (struct adapter *padapter,u8 variable,u8 *val);void rtw_hal_update_ra_mask (struct adapter *padapter,u32 mac_id,u8 level);
drivers/staging/r8188eu/os_dep/ioctl_linux.c +1 -1
@@ -3930,7 +3930,7 @@ static int rtw_dbg_port(struct net_device *dev,DBG_88E ("(B)DMFlag = 0x%x, arg = 0x%x\n" , ODMFlag, arg); ODMFlag = (u32)(0x0f & arg);DBG_88E ("(A)DMFlag = 0x%x\n" , ODMFlag); -rtw_hal_set_hwreg (padapter,HW_VAR_DM_FLAG , (u8 *)(&ODMFlag)); +SetHwReg8188EU (padapter,HW_VAR_DM_FLAG , (u8 *)(&ODMFlag)); }break ;case 0x07 :
drivers/staging/r8188eu/os_dep/os_intfs.c +1 -1
@@ -769,7 +769,7 @@ void rtw_ips_dev_unload(struct adapter *padapter) {DBG_88E ("====> %s...\n" , __func__); -rtw_hal_set_hwreg (padapter,HW_VAR_FIFO_CLEARN_UP ,NULL ); +SetHwReg8188EU (padapter,HW_VAR_FIFO_CLEARN_UP ,NULL );if (padapter->intf_stop) padapter->intf_stop (padapter);
Signature · 1 line
2.33.0
PATCH 2/5 staging: r8188eu: remove GetHwRegHandler from hal_ops
In reply to Michael StraubeRemove GetHwRegHandler from struct hal_ops and remove the wrapper rtw_hal_get_hwreg(). Call GetHwReg8188EU() directly instead.
--- drivers/staging/r8188eu/core/rtw_ap.c | 2 +- drivers/staging/r8188eu/core/rtw_cmd.c | 4 ++-- drivers/staging/r8188eu/core/rtw_ioctl_set.c | 2 +- drivers/staging/r8188eu/core/rtw_mlme.c | 2 +- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 2 +- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/hal/hal_intf.c | 6 ------ drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 4 ++-- drivers/staging/r8188eu/hal/usb_halinit.c | 4 +--- drivers/staging/r8188eu/include/hal_intf.h | 5 +---- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 4 ++-- 14 files changed, 17 insertions(+), 28 deletions(-)
drivers/staging/r8188eu/core/rtw_ap.c +1 -1
@@ -342,7 +342,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) }/* n mode ra_bitmap */ if (psta_ht->ht_option) { -rtw_hal_get_hwreg (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); +GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type));if (rf_type ==RF_2T2R ) limit =16 ;/* 2R */ else
drivers/staging/r8188eu/core/rtw_cmd.c +2 -2
@@ -1234,7 +1234,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter)/* while ((rtw_read32(padapter, 0x414)&0x00ffff00)!= 0) */ /* while ((rtw_read32(padapter, 0x414)&0x0000ff00)!= 0) */ -rtw_hal_get_hwreg (padapter,HW_VAR_CHK_HI_QUEUE_EMPTY , &val); +GetHwReg8188EU (padapter,HW_VAR_CHK_HI_QUEUE_EMPTY , &val);while (!val) {msleep (100 );
@@ -1244,7 +1244,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter)if (cnt >10 )break ; -rtw_hal_get_hwreg (padapter,HW_VAR_CHK_HI_QUEUE_EMPTY , &val); +GetHwReg8188EU (padapter,HW_VAR_CHK_HI_QUEUE_EMPTY , &val); }if (cnt <=10 ) {
drivers/staging/r8188eu/core/rtw_ioctl_set.c +1 -1
@@ -483,7 +483,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) short_GI_20 = (le16_to_cpu (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) &IEEE80211_HT_CAP_SGI_20 ) ?1 :0 ; short_GI_40 = (le16_to_cpu (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) &IEEE80211_HT_CAP_SGI_40 ) ?1 :0 ; -rtw_hal_get_hwreg (adapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); +GetHwReg8188EU (adapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); max_rate = rtw_mcs_rate( rf_type, bw_40MHz & (pregistrypriv->cbw40_enable),
drivers/staging/r8188eu/core/rtw_mlme.c +1 -1
@@ -2001,7 +2001,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)int i;u8 rf_type; - padapter->HalFunc.GetHwRegHandler (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); +GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type));/* update the MCS rates */ for (i =0 ; i <16 ; i++) {
drivers/staging/r8188eu/core/rtw_mlme_ext.c +2 -2
@@ -5188,7 +5188,7 @@ void issue_assocreq(struct adapter *padapter)/* todo: disable SM power save mode */ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |=cpu_to_le16 (0x000c ); -rtw_hal_get_hwreg (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); +GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type));switch (rf_type) {case RF_1T1R :if (pregpriv->rx_stbc)
@@ -6037,7 +6037,7 @@ unsigned int send_beacon(struct adapter *padapter) issue++;do {yield (); -rtw_hal_get_hwreg (padapter,HW_VAR_BCN_VALID , (u8 *)(&bxmitok)); +GetHwReg8188EU (padapter,HW_VAR_BCN_VALID , (u8 *)(&bxmitok)); poll++; }while ((poll %10 ) !=0 && !bxmitok && !padapter->bSurpriseRemoved && !padapter->bDriverStopped); }while (!bxmitok && issue <100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
drivers/staging/r8188eu/core/rtw_pwrctrl.c +1 -1
@@ -246,7 +246,7 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms) start_time = jiffies;while (1 ) { -rtw_hal_get_hwreg (padapter,HW_VAR_FWLPS_RF_ON , &bAwake); +GetHwReg8188EU (padapter,HW_VAR_FWLPS_RF_ON , &bAwake);if (bAwake)break ;
drivers/staging/r8188eu/core/rtw_wlan_util.c +1 -1
@@ -730,7 +730,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE) } } -rtw_hal_get_hwreg (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); +GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type));/* update the MCS rates */ for (i =0 ; i <16 ; i++) {
drivers/staging/r8188eu/hal/hal_intf.c +0 -6
@@ -41,12 +41,6 @@ uint rtw_hal_deinit(struct adapter *adapt)return status; } -void rtw_hal_get_hwreg (struct adapter *adapt,u8 variable,u8 *val) -{ -if (adapt->HalFunc.GetHwRegHandler) - adapt->HalFunc.GetHwRegHandler (adapt, variable, val); -} -void rtw_hal_update_ra_mask (struct adapter *adapt,u32 mac_id,u8 rssi_level) {struct mlme_priv *pmlmepriv = &adapt->mlmepriv;
drivers/staging/r8188eu/hal/rtl8188e_cmd.c +1 -1
@@ -604,7 +604,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)yield ();/* mdelay(10); */ /* check rsvd page download OK. */ -rtw_hal_get_hwreg (adapt,HW_VAR_BCN_VALID , (u8 *)(&bcn_valid)); +GetHwReg8188EU (adapt,HW_VAR_BCN_VALID , (u8 *)(&bcn_valid)); poll++; }while (!bcn_valid && (poll %10 ) !=0 && !adapt->bSurpriseRemoved && !adapt->bDriverStopped); }while (!bcn_valid && DLBcnCount <=100 && !adapt->bSurpriseRemoved && !adapt->bDriverStopped);
drivers/staging/r8188eu/hal/rtl8188e_dm.c +1 -1
@@ -142,7 +142,7 @@ void rtl8188e_HalDmWatchDog(struct adapter *Adapter)return ; fw_cur_in_ps = Adapter->pwrctrlpriv.bFwCurrentInPSMode; -rtw_hal_get_hwreg (Adapter,HW_VAR_FWLPS_RF_ON , (u8 *)(&fw_ps_awake)); +GetHwReg8188EU (Adapter,HW_VAR_FWLPS_RF_ON , (u8 *)(&fw_ps_awake));/* Fw is under p2p powersaving mode, driver should stop dynamic mechanism. */ /* modifed by thomas. 2011.06.11. */
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +2 -2
@@ -1102,7 +1102,7 @@ static u16 hal_EfuseGetCurrentSize_8188e(struct adapter *pAdapter, bool bPseudoTif (bPseudoTest) efuse_addr = (u16)(fakeEfuseUsedBytes);else -rtw_hal_get_hwreg (pAdapter,HW_VAR_EFUSE_BYTES , (u8 *)&efuse_addr); +GetHwReg8188EU (pAdapter,HW_VAR_EFUSE_BYTES , (u8 *)&efuse_addr); while (bContinual && efuse_OneByteRead(pAdapter, efuse_addr, &efuse_data, bPseudoTest) &&
@@ -1490,7 +1490,7 @@ static bool hal_EfusePartialWriteCheck(struct adapter *pAdapter, u8 efuseType, uif (bPseudoTest) { startAddr = (u16)(fakeEfuseUsedBytes %EFUSE_REAL_CONTENT_LEN ); }else { -rtw_hal_get_hwreg (pAdapter,HW_VAR_EFUSE_BYTES , (u8 *)&startAddr); +GetHwReg8188EU (pAdapter,HW_VAR_EFUSE_BYTES , (u8 *)&startAddr); startAddr %=EFUSE_REAL_CONTENT_LEN ; } }else {
drivers/staging/r8188eu/hal/usb_halinit.c +1 -3
@@ -1798,7 +1798,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) } -static void GetHwReg8188EU (struct adapter *Adapter,u8 variable,u8 *val) +void GetHwReg8188EU (struct adapter *Adapter,u8 variable,u8 *val) {struct hal_data_8188e *haldata =GET_HAL_DATA (Adapter);struct odm_dm_struct *podmpriv = &haldata->odmpriv;
@@ -2142,6 +2142,4 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) halfunc->hal_init = &rtl8188eu_hal_init; halfunc->hal_deinit = &rtl8188eu_hal_deinit; - - halfunc->GetHwRegHandler = &GetHwReg8188EU; }
drivers/staging/r8188eu/include/hal_intf.h +1 -4
@@ -124,9 +124,6 @@ typedef s32 (*c2h_id_filter)(u8 id);struct hal_ops {u32 (*hal_init)(struct adapter *padapter);u32 (*hal_deinit)(struct adapter *padapter); - -void (*GetHwRegHandler)(struct adapter *padapter,u8 variable, -u8 *val); };#define RF_CHANGE_BY_INIT 0
@@ -172,11 +169,11 @@ u8 GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariableunsigned int rtl8188eu_inirp_init (struct adapter *Adapter);void SetHwReg8188EU (struct adapter *Adapter,u8 variable,u8 *val); +void GetHwReg8188EU (struct adapter *Adapter,u8 variable,u8 *val);uint rtw_hal_init (struct adapter *padapter);uint rtw_hal_deinit (struct adapter *padapter);void rtw_hal_stop (struct adapter *padapter); -void rtw_hal_get_hwreg (struct adapter *padapter,u8 variable,u8 *val);void rtw_hal_update_ra_mask (struct adapter *padapter,u32 mac_id,u8 level); void rtw_hal_clone_data(struct adapter *dst_adapt,
drivers/staging/r8188eu/os_dep/ioctl_linux.c +2 -2
@@ -3619,7 +3619,7 @@ static void rf_reg_dump(struct adapter *padapter)int i, j =1 , path;u32 value;u8 rf_type, path_nums =0 ; -rtw_hal_get_hwreg (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); +GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type));pr_info ("\n ======= RF REG =======\n" );if ((RF_1T2R == rf_type) || (RF_1T1R == rf_type))
@@ -3926,7 +3926,7 @@ static int rtw_dbg_port(struct net_device *dev,case 0x06 : {u32 ODMFlag; -rtw_hal_get_hwreg (padapter,HW_VAR_DM_FLAG , (u8 *)(&ODMFlag)); +GetHwReg8188EU (padapter,HW_VAR_DM_FLAG , (u8 *)(&ODMFlag));DBG_88E ("(B)DMFlag = 0x%x, arg = 0x%x\n" , ODMFlag, arg); ODMFlag = (u32)(0x0f & arg);DBG_88E ("(A)DMFlag = 0x%x\n" , ODMFlag);
Signature · 1 line
2.33.0
PATCH 3/5 staging: r8188eu: remove hal_init from hal_ops
In reply to Michael StraubeRemove hal_init from struct hal_ops and call rtl8188eu_hal_init() directly.
--- drivers/staging/r8188eu/hal/hal_intf.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 +-- drivers/staging/r8188eu/include/hal_intf.h | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/r8188eu/hal/hal_intf.c +1 -1
@@ -12,7 +12,7 @@ uint rtw_hal_init(struct adapter *adapt) adapt->hw_init_completed = false; - status = adapt->HalFunc.hal_init (adapt); + status =rtl8188eu_hal_init (adapt);if (status == _SUCCESS) { adapt->hw_init_completed = true;
drivers/staging/r8188eu/hal/usb_halinit.c +1 -2
@@ -657,7 +657,7 @@ enum rt_rf_power_state RfOnOffDetect(struct adapter *adapt)return rfpowerstate; }/* HalDetectPwrDownMode */ -static u32 rtl8188eu_hal_init (struct adapter *Adapter) +u32 rtl8188eu_hal_init (struct adapter *Adapter) {u8 value8 =0 ;u16 value16;
@@ -2140,6 +2140,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)DBG_88E ("cant not alloc memory for HAL DATA\n" ); adapt->hal_data_sz =sizeof (struct hal_data_8188e ); - halfunc->hal_init = &rtl8188eu_hal_init; halfunc->hal_deinit = &rtl8188eu_hal_deinit; }
drivers/staging/r8188eu/include/hal_intf.h +2 -1
@@ -122,7 +122,6 @@ enum hal_odm_variable {typedef s32 (*c2h_id_filter )(u8 id);struct hal_ops { -u32 (*hal_init)(struct adapter *padapter);u32 (*hal_deinit)(struct adapter *padapter); };
@@ -175,6 +174,8 @@ uint rtw_hal_init(struct adapter *padapter);uint rtw_hal_deinit (struct adapter *padapter);void rtw_hal_stop (struct adapter *padapter); +u32 rtl8188eu_hal_init (struct adapter *Adapter); +void rtw_hal_update_ra_mask (struct adapter *padapter,u32 mac_id,u8 level);void rtw_hal_clone_data (struct adapter *dst_adapt,struct adapter *src_adapt);
Signature · 1 line
2.33.0
PATCH 4/5 staging: r8188eu: remove hal_ops
In reply to Michael StraubeRemove the last pointer hal_deinit from struct hal_ops and call rtl8188eu_hal_deinit() directly. Remove the now empty struct hal_ops.
--- drivers/staging/r8188eu/hal/hal_intf.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 6 +----- drivers/staging/r8188eu/include/drv_types.h | 1 - drivers/staging/r8188eu/include/hal_intf.h | 5 +---- 4 files changed, 3 insertions(+), 11 deletions(-)
drivers/staging/r8188eu/hal/hal_intf.c +1 -1
@@ -31,7 +31,7 @@ uint rtw_hal_deinit(struct adapter *adapt) {uint status = _SUCCESS; - status = adapt->HalFunc.hal_deinit (adapt); + status =rtl8188eu_hal_deinit (adapt);if (status == _SUCCESS) adapt->hw_init_completed = false;
drivers/staging/r8188eu/hal/usb_halinit.c +1 -5
@@ -978,7 +978,7 @@ static void CardDisableRTL8188EU(struct adapter *Adapter) Adapter->bFWReady = false; } -static u32 rtl8188eu_hal_deinit (struct adapter *Adapter) +u32 rtl8188eu_hal_deinit (struct adapter *Adapter) {DBG_88E ("==> %s\n" , __func__);
@@ -2133,12 +2133,8 @@ void rtl8188eu_init_default_value(struct adapter *adapt)void rtl8188eu_set_hal_ops (struct adapter *adapt) { -struct hal_ops *halfunc = &adapt->HalFunc; - adapt->HalData =kzalloc (sizeof (struct hal_data_8188e ),GFP_KERNEL );if (!adapt->HalData)DBG_88E ("cant not alloc memory for HAL DATA\n" ); adapt->hal_data_sz =sizeof (struct hal_data_8188e ); - - halfunc->hal_deinit = &rtl8188eu_hal_deinit; }
drivers/staging/r8188eu/include/drv_types.h +0 -1
@@ -228,7 +228,6 @@ struct adapter {void *HalData;u32 hal_data_sz; -struct hal_ops HalFunc;s32 bDriverStopped;s32 bSurpriseRemoved;
drivers/staging/r8188eu/include/hal_intf.h +1 -4
@@ -121,10 +121,6 @@ enum hal_odm_variable {typedef s32 (*c2h_id_filter )(u8 id); -struct hal_ops { -u32 (*hal_deinit)(struct adapter *padapter); -}; -#define RF_CHANGE_BY_INIT 0#define RF_CHANGE_BY_IPS BIT(28)#define RF_CHANGE_BY_PS BIT(29)
@@ -175,6 +171,7 @@ uint rtw_hal_deinit(struct adapter *padapter);void rtw_hal_stop (struct adapter *padapter);u32 rtl8188eu_hal_init (struct adapter *Adapter); +u32 rtl8188eu_hal_deinit (struct adapter *Adapter);void rtw_hal_update_ra_mask (struct adapter *padapter,u32 mac_id,u8 level); void rtw_hal_clone_data(struct adapter *dst_adapt,
Signature · 1 line
2.33.0
PATCH 5/5 staging: r8188eu: rename rtl8188eu_set_hal_ops()
In reply to Michael StraubeAfter the removal of struct hal_ops function rtl8188eu_set_hal_ops() only allocates memory for adapt->HalData. Rename the function to rtl8188eu_alloc_haldata() to reflect what it actually does.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 2 +- drivers/staging/r8188eu/include/hal_intf.h | 2 +- drivers/staging/r8188eu/os_dep/usb_intf.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +1 -1
@@ -2131,7 +2131,7 @@ void rtl8188eu_init_default_value(struct adapter *adapt) haldata->odmpriv.RFCalibrateInfo.ThermalValue_HP[i] =0 ; } -void rtl8188eu_set_hal_ops (struct adapter *adapt) +void rtl8188eu_alloc_haldata (struct adapter *adapt) { adapt->HalData =kzalloc (sizeof (struct hal_data_8188e ),GFP_KERNEL );if (!adapt->HalData)
drivers/staging/r8188eu/include/hal_intf.h +1 -1
@@ -131,7 +131,7 @@ typedef s32 (*c2h_id_filter)(u8 id);#define is_boot_from_eeprom (adapter) (adapter->eeprompriv.EepromOrEfuse) -void rtl8188eu_set_hal_ops (struct adapter *padapter); +void rtl8188eu_alloc_haldata (struct adapter *adapt);void rtl8188eu_interface_configure (struct adapter *adapt);void ReadAdapterInfo8188EU (struct adapter *Adapter);
drivers/staging/r8188eu/os_dep/usb_intf.c +2 -2
@@ -398,8 +398,8 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,SET_NETDEV_DEV (pnetdev,dvobj_to_dev (dvobj)); padapter =rtw_netdev_priv (pnetdev); -/* step 2. hook HalFunc, allocate HalData */ -rtl8188eu_set_hal_ops (padapter); +/* step 2. allocate HalData */ +rtl8188eu_alloc_haldata (padapter); padapter->intf_start = &usb_intf_start; padapter->intf_stop = &usb_intf_stop;
Signature · 1 line
2.33.0
Greg KH
maintainerQuoted 7 lines · Michael Straube
This series removes the remaining pointers from struct
hal_opsand the struct itself.Note that I sent the first two patches separately yesterday, so this series makes the separately sent patches obsolete.
Tested with Inter-Tech DMG-02 on
x86_64.
Nice work, thanks for getting rid of this unneeded structure!
greg k-h