rtlwifi: rtl8192de: Style clean-ups
PATCH v2 1/1 rtlwifi: rtl8192de: Style clean-ups
Clean up some style issues:
- Use ARRAY_SIZE() for arrays (even when u8 sized)
- Remove redundant CHANNEL_MAX_NUMBER_2G define. Additionally fix some dead code WARNs.
--- .../wireless/realtek/rtlwifi/rtl8192de/phy.c | 17 +++++++---------- drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - 2 files changed, 7 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c +7 -10
@@ -899,7 +899,7 @@ static u8 _rtl92c_phy_get_rightchnlplace(u8 chnl)u8 place = chnl;if (chnl >14 ) { -for (place =14 ; place <sizeof (channel5g); place++) { +for (place =14 ; place <ARRAY_SIZE (channel5g); place++) {if (channel5g[place] == chnl) { place++;break ;
@@ -1366,7 +1366,7 @@ u8 rtl92d_get_rightchnlplace_for_iqk(u8 chnl)u8 place = chnl;if (chnl >14 ) { -for (place =14 ; place <sizeof (channel_all); place++) { +for (place =14 ; place <ARRAY_SIZE (channel_all); place++) {if (channel_all[place] == chnl)return place -13 ; }
@@ -2428,7 +2428,7 @@ static bool _rtl92d_is_legal_5g_channel(struct ieee80211_hw *hw, u8 channel)int i; -for (i =0 ; i <sizeof (channel5g); i++) +for (i =0 ; i <ARRAY_SIZE (channel5g); i++)if (channel == channel5g[i])return true;return false;
@@ -2692,9 +2692,8 @@ void rtl92d_phy_reset_iqk_result(struct ieee80211_hw *hw)u8 i;rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD , -"settings regs %d default regs %d\n" , - (int )(sizeof (rtlphy->iqk_matrix) / -sizeof (struct iqk_matrix_regs )), +"settings regs %zu default regs %d\n" , +ARRAY_SIZE (rtlphy->iqk_matrix),IQK_MATRIX_REG_NUM );/* 0xe94, 0xe9c, 0xea4, 0xeac, 0xeb4, 0xebc, 0xec4, 0xecc */ for (i =0 ; i <IQK_MATRIX_SETTINGS_NUM ; i++) {
@@ -2861,16 +2860,14 @@ u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw)case BAND_ON_5G :/* Get first channel error when change between * 5G and 2.4G band. */ -if (channel <=14 ) +if (WARN_ONCE (channel <=14 ,"rtl8192de: 5G but channel<=14\n" ))return 0 ; -WARN_ONCE ((channel <=14 ),"rtl8192de: 5G but channel<=14\n" );break ;case BAND_ON_2_4G :/* Get first channel error when change between * 5G and 2.4G band. */ -if (channel >14 ) +if (WARN_ONCE (channel >14 ,"rtl8192de: 2G but channel>14\n" ))return 0 ; -WARN_ONCE ((channel >14 ),"rtl8192de: 2G but channel>14\n" );break ;default : WARN_ONCE(true, "rtl8192de: Invalid WirelessMode(%#x)!!\n",
drivers/net/wireless/realtek/rtlwifi/wifi.h +0 -1
@@ -108,7 +108,6 @@#define CHANNEL_GROUP_IDX_5GM 6#define CHANNEL_GROUP_IDX_5GH 9#define CHANNEL_GROUP_MAX_5G 9 -#define CHANNEL_MAX_NUMBER_2G 14#define AVG_THERMAL_NUM 8#define AVG_THERMAL_NUM_88E 4#define AVG_THERMAL_NUM_8723BE 4
Signature · 1 line
2.30.2
Quoted 15 lines
-----Original Message-----
From: Kees Cook [mailto:[email protected]]
Sent: Thursday, August 26, 2021 10:33 AM
To: Pkshih
Cc: Kees Cook; Kalle Valo; David S. Miller; Jakub Kicinski; Larry Finger; Colin Ian King; [email protected]; [email protected]; Joe Perches; Kaixu Xia; [email protected]; [email protected]
Subject: [PATCH v2] rtlwifi: rtl8192de: Style clean-upsClean up some style issues:
- UseARRAY_SIZE()for arrays (even when u8 sized)
- Remove redundantCHANNEL_MAX_NUMBER_2Gdefine. Additionally fix some dead code WARNs.
Quoted 9 lines
Cc Ping-Ke Shih <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Larry Finger <[email protected]>Cc Colin Ian King <[email protected]>Signed-off-by Kees Cook <[email protected]>
[...]
Quoted 5 lines · Kees Cook
Clean up some style issues:
- UseARRAY_SIZE()for arrays (even when u8 sized)
- Remove redundantCHANNEL_MAX_NUMBER_2Gdefine. Additionally fix some dead code WARNs.
Quoted 10 lines
Cc Ping-Ke Shih <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Larry Finger <[email protected]>Cc Colin Ian King <[email protected]>Signed-off-by Kees Cook <[email protected]>Acked-by Ping-Ke Shih <[email protected]>
Failed to apply, please rebase over wireless-drivers-next.
error: sha1 information is lacking or useless (drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: rtlwifi: rtl8192de: Style clean-ups
Patch failed at 0001 rtlwifi: rtl8192de: Style clean-ups
Patch set to Changes Requested.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches