rtlwifi: rtl8192de: Style clean-ups

Clean up some style issues:
- Use ARRAY_SIZE() even though it's a u8 array.
- Remove redundant CHANNEL_MAX_NUMBER_2G define.
Additionally fix some dead code WARNs.

Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://lore.kernel.org/lkml/57d0d1b6064342309f680f692192556c@realtek.com/
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211119192233.1021063-1-keescook@chromium.org

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
index 9b83c710c9b86f996b6b0b2f5b11260d96b872c2..51fe51bb05041b3e64f89e1dab02633f663b42ec 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
@@ -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;
 
        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",

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index aa07856411b120e6324bb20e5948a1b97a7b2aeb..31f9e9e5c68042f2134f71c9026ec659d64e7832 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -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