iwlwifi: mvm: add fall through comments where needed

Some switch-cases were missing a fall through comment, so the compiler
may warn.  Fix that by adding the comments where needed.  In other
cases there was more text in the comment, which the compiler doesn't
recognize, so either remove the extra text or move it to a separate
comment line as appropriate.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/led.c b/drivers/net/wireless/intel/iwlwifi/mvm/led.c
index 9bb1de1cad64af631af6241c28612dc86efb9642..4348bb00e761fe204522006c187aa38ca8f95767 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/led.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/led.c
@@ -7,6 +7,7 @@
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2017        Intel Deutschland GmbH
+ * Copyright(c) 2018        Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -28,6 +29,7 @@
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2017        Intel Deutschland GmbH
+ * Copyright(c) 2018        Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -113,6 +115,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 */
        case IWL_LED_DEFAULT:
        case IWL_LED_RF_STATE:
                mode = IWL_LED_RF_STATE;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 8837d7667f363af4928ba50449005336d6e2be94..4e676a6936c147197e6fd485e1c4e5ceab84c510 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -3901,6 +3901,7 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,
                        mvmvif->ap_ibss_active = true;
                        break;
                }
+               /* fall through */
        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 f369173db11cae7ba658f85e283b4b76eae81ce6..86e40bae57e3c7678edeecf238a4315d0c104ae6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
@@ -109,6 +109,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 */
        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 235ab26ca429a7fdda5e7ffdd543715a8b080b02..fbd3014e8b82b25edda2300f302a3ae3d6c24673 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -222,7 +222,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 if TTAK OK */
+               /* fall through */
 
        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 2c56f73d688e5438659075a44d00c9e6496183d8..b5ff3325c1d3c6a1e5ee454561dd58ffd19e5e96 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -310,7 +310,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 if TTAK OK */
+               /* fall through */
        case IWL_RX_MPDU_STATUS_SEC_WEP:
                if (!(status & IWL_RX_MPDU_STATUS_ICV_OK))
                        return -1;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index af8156ba808415df64521bcebac066fd11a95672..853bf679dc264356d9c338a0d4651fcfccc25864 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1616,10 +1616,10 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)
                if (mvm->scan_status & IWL_MVM_SCAN_SCHED_MASK)
                        return iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_SCHED,
                                                 true);
-
-               /* fall through, something is wrong if no scan was
-                * running but we ran out of scans.
+               /* Something is wrong if no scan was running but we
+                * ran out of scans.
                 */
+               /* fall through */
        default:
                WARN_ON(1);
                break;