iwlwifi: mvm: Fix fall-through warnings for Clang

In preparation to enable -Wimplicit-fallthrough for Clang, fix multiple
warnings by explicitly using the fallthrough pseudo-keyword as a
replacement for a number of "fall through" markings.

Notice that Clang doesn't recognize "fall through" comments as
implicit fall-through.

Link: https://github.com/KSPP/linux/issues/115
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201117135053.GA13248@embeddedor

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/led.c b/drivers/net/wireless/intel/iwlwifi/mvm/led.c
index 3450a8bc3212414c236d818a618a0ea90da42247..1ea7c44250d4e8c5e12d84fdca61c44a4dcb86bf 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/led.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/led.c
@@ -58,7 +58,7 @@ int iwl_mvm_leds_init(struct iwl_mvm *mvm)
        switch (mode) {
        case IWL_LED_BLINK:
                IWL_ERR(mvm, "Blink led mode not supported, used default\n");
-               /* fall through */
+               fallthrough;
        case IWL_LED_DEFAULT:
        case IWL_LED_RF_STATE:
                mode = IWL_LED_RF_STATE;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index 01f4fc6b7611a011b46e057921a47254b2561c82..9078fcb5286c16012c12dea2631b452880f59091 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -232,7 +232,7 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
        case NL80211_IFTYPE_STATION:
                if (!vif->p2p)
                        break;
-               /* fall through */
+               fallthrough;
        default:
                __clear_bit(0, data.available_mac_ids);
        }

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index b4b65e9bb480c3344afa096e68a961e10937dca9..da32937ba9a7898a5517d8418e1daba0f95252b0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -4047,7 +4047,7 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,
                        mvmvif->ap_ibss_active = true;
                        break;
                }
-               /* fall through */
+               fallthrough;
        case NL80211_IFTYPE_ADHOC:
                /*
                 * The AP binding flow is handled as part of the start_ap flow

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
index 1733f5fadeebface45a949f70b1678f495aeb08e..0fd51f6aa2061b5ceb1c608bf753629af5d018fc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
@@ -52,7 +52,7 @@ u8 iwl_mvm_get_ctrl_pos(struct cfg80211_chan_def *chandef)
                return PHY_VHT_CTRL_POS_4_ABOVE;
        default:
                WARN(1, "Invalid channel definition");
-               /* fall through */
+               fallthrough;
        case 0:
                /*
                 * The FW is expected to check the control channel position only

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index b562e07a5f229704775f6e436297e09476d26dfe..f0364add85f9ac1bfc40396e88a7220d6c3442d0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -170,7 +170,7 @@ static u32 iwl_mvm_set_mac80211_rx_flag(struct iwl_mvm *mvm,
                    !(rx_pkt_status & RX_MPDU_RES_STATUS_TTAK_OK))
                        return 0;
                *crypt_len = IEEE80211_TKIP_IV_LEN;
-               /* fall through */
+               fallthrough;
 
        case RX_MPDU_RES_STATUS_SEC_WEP_ENC:
                if (!(rx_pkt_status & RX_MPDU_RES_STATUS_ICV_OK))

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 8d33739c29efbdeaf1f63e8095331cafe4344239..4dc7c65a1130e2c5f3fdca323f77a98418ed37df 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -323,7 +323,7 @@ static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr,
                        stats->flag |= RX_FLAG_MMIC_ERROR;
 
                *crypt_len = IEEE80211_TKIP_IV_LEN;
-               /* fall through */
+               fallthrough;
        case IWL_RX_MPDU_STATUS_SEC_WEP:
                if (!(status & IWL_RX_MPDU_STATUS_ICV_OK))
                        return -1;
@@ -1282,7 +1282,7 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,
                he->data4 |= le16_encode_bits(le32_get_bits(phy_data->d2,
                                                            IWL_RX_PHY_DATA2_HE_TB_EXT_SPTL_REUSE4),
                                              IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE4);
-               /* fall through */
+               fallthrough;
        case IWL_RX_PHY_INFO_TYPE_HE_SU:
        case IWL_RX_PHY_INFO_TYPE_HE_MU:
        case IWL_RX_PHY_INFO_TYPE_HE_MU_EXT:
@@ -1355,7 +1355,7 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,
                                                       IWL_RX_PHY_DATA4_HE_MU_EXT_PREAMBLE_PUNC_TYPE_MASK),
                                         IEEE80211_RADIOTAP_HE_MU_FLAGS2_PUNC_FROM_SIG_A_BW);
                iwl_mvm_decode_he_mu_ext(mvm, phy_data, rate_n_flags, he_mu);
-               /* fall through */
+               fallthrough;
        case IWL_RX_PHY_INFO_TYPE_HE_MU:
                he_mu->flags2 |=
                        le16_encode_bits(le32_get_bits(phy_data->d1,
@@ -1365,7 +1365,7 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,
                        le16_encode_bits(le32_get_bits(phy_data->d1,
                                                       IWL_RX_PHY_DATA1_HE_MU_SIGB_COMPRESSION),
                                         IEEE80211_RADIOTAP_HE_MU_FLAGS2_SIG_B_COMP);
-               /* fall through */
+               fallthrough;
        case IWL_RX_PHY_INFO_TYPE_HE_TB:
        case IWL_RX_PHY_INFO_TYPE_HE_TB_EXT:
                iwl_mvm_decode_he_phy_ru_alloc(phy_data, rate_n_flags,

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index c362db97ae90de44057441277b8c6e401a9d58db..97d2de8f158205f1f31749f613f1709ce2f3439f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -2341,7 +2341,7 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)
                /* Something is wrong if no scan was running but we
                 * ran out of scans.
                 */
-               /* fall through */
+               fallthrough;
        default:
                WARN_ON(1);
                break;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index e8a3b0994a2d46a1641014acf89b02582e675670..dc174410bf9c29075f5bdf31ae94ea3beb038021 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -89,13 +89,13 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
        switch (sta->bandwidth) {
        case IEEE80211_STA_RX_BW_160:
                add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_FAT_EN_160MHZ);
-               /* fall through */
+               fallthrough;
        case IEEE80211_STA_RX_BW_80:
                add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_FAT_EN_80MHZ);
-               /* fall through */
+               fallthrough;
        case IEEE80211_STA_RX_BW_40:
                add_sta_cmd.station_flags |= cpu_to_le32(STA_FLG_FAT_EN_40MHZ);
-               /* fall through */
+               fallthrough;
        case IEEE80211_STA_RX_BW_20:
                if (sta->ht_cap.ht_supported)
                        add_sta_cmd.station_flags |=
@@ -3240,14 +3240,14 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,
                break;
        case WLAN_CIPHER_SUITE_WEP104:
                key_flags |= cpu_to_le16(STA_KEY_FLG_WEP_13BYTES);
-               /* fall through */
+               fallthrough;
        case WLAN_CIPHER_SUITE_WEP40:
                key_flags |= cpu_to_le16(STA_KEY_FLG_WEP);
                memcpy(u.cmd.common.key + 3, key->key, key->keylen);
                break;
        case WLAN_CIPHER_SUITE_GCMP_256:
                key_flags |= cpu_to_le16(STA_KEY_FLG_KEY_32BYTES);
-               /* fall through */
+               fallthrough;
        case WLAN_CIPHER_SUITE_GCMP:
                key_flags |= cpu_to_le16(STA_KEY_FLG_GCMP);
                memcpy(u.cmd.common.key, key->key, key->keylen);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index c429eba08807788eeff3484ccc757fc756dc3cbd..a983c215df310776ffe67f3b3ffa203eab609bfc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -399,7 +399,7 @@ static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm,
 
        case WLAN_CIPHER_SUITE_WEP104:
                tx_cmd->sec_ctl |= TX_CMD_SEC_KEY128;
-               /* fall through */
+               fallthrough;
        case WLAN_CIPHER_SUITE_WEP40:
                tx_cmd->sec_ctl |= TX_CMD_SEC_WEP |
                        ((keyconf->keyidx << TX_CMD_SEC_WEP_KEY_IDX_POS) &
@@ -410,7 +410,7 @@ static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm,
        case WLAN_CIPHER_SUITE_GCMP:
        case WLAN_CIPHER_SUITE_GCMP_256:
                type = TX_CMD_SEC_GCMP;
-               /* Fall through */
+               fallthrough;
        case WLAN_CIPHER_SUITE_CCMP_256:
                /* TODO: Taking the key from the table might introduce a race
                 * when PTK rekeying is done, having an old packets with a PN