staging: rtl8188eu: use __func__ in hal directory
PATCH 1/2 staging: rtl8188eu: use __func__ in hal directory
Use __func__ instead of hardcoded function names to clear checkpatch warnings.
--- drivers/staging/rtl8188eu/hal/hal_intf.c | 4 +- drivers/staging/rtl8188eu/hal/odm.c | 60 +++++++++---------- drivers/staging/rtl8188eu/hal/phy.c | 2 +- drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 25 ++++---- .../staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 +- .../staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/rtl8188eu/hal/usb_halinit.c | 5 +- 7 files changed, 50 insertions(+), 50 deletions(-)
drivers/staging/rtl8188eu/hal/hal_intf.c +2 -2
@@ -23,7 +23,7 @@ uint rtw_hal_init(struct adapter *adapt)rtw_hal_notch_filter (adapt,1 ); }else { adapt->hw_init_completed = false; -DBG_88E ("rtw_hal_init: hal__init fail\n" ); +DBG_88E ("%s: hal__init fail\n" , __func__); } RT_TRACE(_module_hal_init_c_, _drv_err_,
@@ -41,7 +41,7 @@ uint rtw_hal_deinit(struct adapter *adapt)if (status == _SUCCESS) adapt->hw_init_completed = false;else -DBG_88E ("\n rtw_hal_deinit: hal_init fail\n" ); +DBG_88E ("\n %s: hal_init fail\n" , __func__);return status; }
drivers/staging/rtl8188eu/hal/odm.c +30 -30
170 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/phy.c +1 -1
@@ -345,7 +345,7 @@ static void dm_txpwr_track_setpwr(struct odm_dm_struct *dm_odm) {if (dm_odm->BbSwingFlagOfdm || dm_odm->BbSwingFlagCck) {ODM_RT_TRACE (dm_odm,ODM_COMP_TX_PWR_TRACK ,ODM_DBG_LOUD , - ("dm_txpwr_track_setpwr CH=%d\n" , *dm_odm->pChannel)); + ("%s CH=%d\n" , __func__, *dm_odm->pChannel));phy_set_tx_power_level (dm_odm->Adapter, *dm_odm->pChannel); dm_odm->BbSwingFlagOfdm = false; dm_odm->BbSwingFlagCck = false;
drivers/staging/rtl8188eu/hal/pwrseqcmd.c +13 -12
@@ -26,25 +26,26 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, pwrcfgcmd = pwrseqcmd[aryidx];RT_TRACE (_module_hal_init_c_, _drv_info_, - ("rtl88eu_pwrseqcmdparsing: offset(%#x) cut_msk(%#x)" + ("%s: offset(%#x) cut_msk(%#x)" " cmd(%#x)" "msk(%#x) value(%#x)\n" , -GET_PWR_CFG_OFFSET (pwrcfgcmd), -GET_PWR_CFG_CUT_MASK (pwrcfgcmd), -GET_PWR_CFG_CMD (pwrcfgcmd), -GET_PWR_CFG_MASK (pwrcfgcmd), -GET_PWR_CFG_VALUE (pwrcfgcmd))); + __func__, +GET_PWR_CFG_OFFSET (pwrcfgcmd), +GET_PWR_CFG_CUT_MASK (pwrcfgcmd), +GET_PWR_CFG_CMD (pwrcfgcmd), +GET_PWR_CFG_MASK (pwrcfgcmd), +GET_PWR_CFG_VALUE (pwrcfgcmd)));/* Only Handle the command whose CUT is matched */ if (GET_PWR_CFG_CUT_MASK (pwrcfgcmd) & cut_vers) {switch (GET_PWR_CFG_CMD (pwrcfgcmd)) {case PWR_CMD_READ :RT_TRACE (_module_hal_init_c_, _drv_info_, - ("rtl88eu_pwrseqcmdparsing: PWR_CMD_READ\n" )); + ("%s: PWR_CMD_READ\n" , __func__));break ;case PWR_CMD_WRITE :RT_TRACE (_module_hal_init_c_, _drv_info_, - ("rtl88eu_pwrseqcmdparsing: PWR_CMD_WRITE\n" )); + ("%s: PWR_CMD_WRITE\n" , __func__)); offset =GET_PWR_CFG_OFFSET (pwrcfgcmd);/* Read the value from system register */
@@ -59,7 +60,7 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers,break ;case PWR_CMD_POLLING :RT_TRACE (_module_hal_init_c_, _drv_info_, - ("rtl88eu_pwrseqcmdparsing: PWR_CMD_POLLING\n" )); + ("%s: PWR_CMD_POLLING\n" , __func__)); poll_bit = false; offset =GET_PWR_CFG_OFFSET (pwrcfgcmd);
@@ -81,7 +82,7 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers,break ;case PWR_CMD_DELAY :RT_TRACE (_module_hal_init_c_, _drv_info_, - ("rtl88eu_pwrseqcmdparsing: PWR_CMD_DELAY\n" )); + ("%s: PWR_CMD_DELAY\n" , __func__));if (GET_PWR_CFG_VALUE (pwrcfgcmd) ==PWRSEQ_DELAY_US )udelay (GET_PWR_CFG_OFFSET (pwrcfgcmd));else
@@ -90,11 +91,11 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers,case PWR_CMD_END :/* When this command is parsed, end the process */ RT_TRACE (_module_hal_init_c_, _drv_info_, - ("rtl88eu_pwrseqcmdparsing: PWR_CMD_END\n" )); + ("%s: PWR_CMD_END\n" , __func__));return true;default :RT_TRACE (_module_hal_init_c_, _drv_err_, - ("rtl88eu_pwrseqcmdparsing: Unknown CMD!!\n" )); + ("%s: Unknown CMD!!\n" , __func__));break ; } }
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +1 -1
@@ -95,7 +95,7 @@ void _8051Reset88E(struct adapter *padapter) u1bTmp =usb_read8 (padapter,REG_SYS_FUNC_EN +1 );usb_write8 (padapter,REG_SYS_FUNC_EN +1 , u1bTmp & (~BIT (2 )));usb_write8 (padapter,REG_SYS_FUNC_EN +1 , u1bTmp | (BIT (2 ))); -DBG_88E ("=====> _8051Reset88E(): 8051 reset success .\n" ); +DBG_88E ("=====> %s(): 8051 reset success .\n" , __func__); }void rtl8188e_InitializeFirmwareVars (struct adapter *padapter)
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +1 -1
@@ -346,7 +346,7 @@ static s32 rtw_dump_xframe(struct adapter *adapt, struct xmit_frame *pxmitframe)rtw_issue_addbareq_cmd (adapt, pxmitframe); mem_addr = pxmitframe->buf_addr; -RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("rtw_dump_xframe()\n" )); +RT_TRACE (_module_rtl871x_xmit_c_, _drv_info_, ("%s()\n" , __func__));for (t =0 ; t < pattrib->nr_frags; t++) {if (inner_ret != _SUCCESS && ret == _SUCCESS)
drivers/staging/rtl8188eu/hal/usb_halinit.c +2 -3
@@ -876,7 +876,7 @@ static void CardDisableRTL8188EU(struct adapter *Adapter) {u8 val8; -RT_TRACE (_module_hci_hal_init_c_, _drv_info_, ("CardDisableRTL8188EU\n" )); +RT_TRACE (_module_hci_hal_init_c_, _drv_info_, ("%s\n" , __func__));/* Stop Tx Report Timer. 0x4EC[Bit1]=b'0 */ val8 =usb_read8 (Adapter,REG_TX_RPT_CTRL );
@@ -1038,8 +1038,7 @@ static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, boolmemcpy (eeprom->mac_addr, &hwinfo[EEPROM_MAC_ADDR_88EU ],ETH_ALEN ); }RT_TRACE (_module_hci_hal_init_c_, _drv_notice_, - ("Hal_EfuseParseMACAddr_8188EU: Permanent Address = %pM\n" , - eeprom->mac_addr)); + ("%s: Permanent Address = %pM\n" , __func__, eeprom->mac_addr)); }static void readAdapterInfo_8188EU (struct adapter *adapt)
Signature · 1 line
2.28.0
PATCH 2/2 staging: rtl8188eu: clean up comparsion style issues
Move constants to the right side of comparsions to follow kernel coding style and clear checkpatch warnings. In case of comparsion to _FAIL we can use '!' since _FAIL is defined as '0'.
WARNING: Comparisons should place the constant on the right side of the test
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 6 +++--- drivers/staging/rtl8188eu/hal/odm.c | 4 ++-- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 +- drivers/staging/rtl8188eu/include/rtw_mlme.h | 4 ++-- drivers/staging/rtl8188eu/include/wifi.h | 2 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +3 -3
@@ -2981,7 +2981,7 @@ static unsigned int OnAssocReq(struct adapter *padapter, status = _STATS_FAILURE_; } -if (_STATS_SUCCESSFUL_ != status) +if (status != _STATS_SUCCESSFUL_) goto OnAssocReqFail;/* check if the supported rate is ok */
@@ -3072,7 +3072,7 @@ static unsigned int OnAssocReq(struct adapter *padapter, wpa_ie_len =0 ; } -if (_STATS_SUCCESSFUL_ != status) +if (status != _STATS_SUCCESSFUL_) goto OnAssocReqFail; pstat->flags &= ~(WLAN_STA_WPS |WLAN_STA_MAYBE_WPS );
@@ -3282,7 +3282,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,spin_unlock_bh (&pstapriv->asoc_list_lock);/* now the station is qualified to join our BSS... */ -if ((pstat->state &WIFI_FW_ASSOC_SUCCESS ) && (_STATS_SUCCESSFUL_ == status)) { +if ((pstat->state &WIFI_FW_ASSOC_SUCCESS ) && (status == _STATS_SUCCESSFUL_)) {/* 1 bss_cap_update & sta_info_update */ bss_cap_update_on_sta_join (padapter, pstat);sta_info_update (padapter, pstat);
drivers/staging/rtl8188eu/hal/odm.c +2 -2
@@ -829,9 +829,9 @@ bool ODM_RAStateCheck(struct odm_dm_struct *pDM_Odm, s32 RSSI, bool bForceUpdate }/* Decide RATRState by RSSI. */ -if (RSSI > HighRSSIThreshForRA) +if (HighRSSIThreshForRA <RSSI ) RATRState =DM_RATR_STA_HIGH ; -else if (RSSI > LowRSSIThreshForRA) +else if (LowRSSIThreshForRA <RSSI ) RATRState =DM_RATR_STA_MIDDLE ;else RATRState =DM_RATR_STA_LOW ;
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +1 -1
@@ -187,7 +187,7 @@ static s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data)/* polling */ do { value = usb_read32(padapter, LLTReg); - if (_LLT_NO_ACTIVE == _LLT_OP_VALUE(value)) + if (_LLT_OP_VALUE(value) == _LLT_NO_ACTIVE) break; if (count > POLLING_LLT_THRESHOLD) {
drivers/staging/rtl8188eu/include/rtw_mlme.h +2 -2
@@ -266,7 +266,7 @@ static inline void set_fwstate(struct mlme_priv *pmlmepriv, int state) { pmlmepriv->fw_state |= state;/* FOR HW integration */ -if (_FW_UNDER_SURVEY == state) +if (state == _FW_UNDER_SURVEY) pmlmepriv->bScanInProcess = true; }
@@ -274,7 +274,7 @@ static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, int state) { pmlmepriv->fw_state &= ~state;/* FOR HW integration */ -if (_FW_UNDER_SURVEY == state) +if (state == _FW_UNDER_SURVEY) pmlmepriv->bScanInProcess = false; }
drivers/staging/rtl8188eu/include/wifi.h +1 -1
@@ -326,7 +326,7 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)static inline int IsFrameTypeCtrl (unsigned char *pframe) { -if (WIFI_CTRL_TYPE ==GetFrameType (pframe)) +if (GetFrameType (pframe) ==WIFI_CTRL_TYPE )return true;else return false;
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +5 -5
@@ -694,7 +694,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,enum ndis_802_11_network_infra networkType;int ret =0 ; -if (_FAIL ==rtw_pwr_wakeup (padapter)) { +if (!rtw_pwr_wakeup (padapter)) { ret = -EPERM ; goto exit; }
@@ -946,7 +946,7 @@ static int rtw_wx_set_wap(struct net_device *dev,struct wlan_network *pnetwork =NULL ;enum ndis_802_11_auth_mode authmode; -if (_FAIL ==rtw_pwr_wakeup (padapter)) { +if (!rtw_pwr_wakeup (padapter)) { ret =-1 ; goto exit; }
@@ -1065,7 +1065,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("%s\n" , __func__)); -if (_FAIL ==rtw_pwr_wakeup (padapter)) { +if (!rtw_pwr_wakeup (padapter)) { ret =-1 ; goto exit; }
@@ -1269,7 +1269,7 @@ static int rtw_wx_set_essid(struct net_device *dev,RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_info_, ("+%s: fw_state = 0x%08x\n" , __func__,get_fwstate (pmlmepriv))); -if (_FAIL ==rtw_pwr_wakeup (padapter)) { +if (!rtw_pwr_wakeup (padapter)) { ret =-1 ; goto exit; }
@@ -2878,7 +2878,7 @@ static int rtw_wx_set_priv(struct net_device *dev,int probereq_wpsie_len = len;u8 wps_oui[4 ] = {0x0 ,0x50 ,0xf2 ,0x04 }; -if ((_VENDOR_SPECIFIC_IE_ == probereq_wpsie[0 ]) && +if ((probereq_wpsie[0 ] == _VENDOR_SPECIFIC_IE_) && (!memcmp (&probereq_wpsie[2 ], wps_oui,4 ))) { cp_sz =min (probereq_wpsie_len,MAX_WPS_IE_LEN );
Signature · 1 line
2.28.0
Quoted 2 lines · Michael Straube
Use
__func__instead of hardcoded function names to clear checkpatch warnings.
[]
drivers/staging/rtl8188eu/hal/odm.c
Quoted 1 line
drivers/staging/rtl8188eu/hal/odm.c +0
-0
[]
drivers/staging/rtl8188eu/hal/odm.c void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm) · line 255
Quoted 9 lines
drivers/staging/rtl8188eu/hal/odm.c +1
-1@@ -249,7 +249,7 @@ void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm)void odm_CmnInfoInit_Debug (struct odm_dm_struct *pDM_Odm) { -ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("odm_CmnInfoInit_Debug==>\n" )); +ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("%s==>\n" , __func__));ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("SupportPlatform=%d\n" , pDM_Odm->SupportPlatform));ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("SupportAbility=0x%x\n" , pDM_Odm->SupportAbility));ODM_RT_TRACE (pDM_Odm,ODM_COMP_COMMON ,ODM_DBG_LOUD , ("SupportInterface=%d\n" , pDM_Odm->SupportInterface));
These ODM_RT_TRACE macro uses are rather ugly. Perhaps a rename to odm_dbg would be better. So would removing the unnecessary parentheses from the macro uses and fixing the macro definition
Maybe using a perl script something like the below:
our $balanced_parens = qr/(\((?:[^\(\)]++|(?-1))*\))/;
sub deparenthesize {
my ($string) = @_;
return "" if (!defined($string));
while ($string =~ /^\s*\(.*\)\s*$/s) {
$string =~ s@^\s*\(\s*@@s;
$string =~ s@\s*\)\s*$@@s;
}
return $string;
}foreach my $file (@ARGV) {
my $FILE;
my $count;
open($FILE, '<', $file) or die("Can't read $file $!\n");
undef $/;
my $text = (<$FILE>);
close($FILE);
$count = $text =~ s/ODM_RT_TRACE\s*\(\s*([^,]*),\s*ODM_COMP_(\w+)\s*,\s*ODM_DBG_(\w+)\s*,\s*($balanced_parens)\s*\)\s*;/"odm_dbg($1, $2, $3, " . deparenthesize($4) . ");"/ge;
if ($count > 0) {
open($FILE, '>', $file) or die("Can't write $file $!\n");
print $FILE $text;
close($FILE);
}
}