iwlwifi: remove upper case letters in sku_capa_band_*_enable

The sku_capa_band_24GHz_enable and sku_capa_band_52GHz_enable symbols
cause checkpatch to complain whenever we use them.  To prevent this,
convert them to all lower case.

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

diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
index e68254e127641005e8ef50a983c4ae9e3ea9480f..030482b357a3c3038bcf456f2c782b04747fa70f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
@@ -1200,16 +1200,16 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
                return -EINVAL;
        }
 
-       if (!data->sku_cap_11n_enable && !data->sku_cap_band_24GHz_enable &&
-           !data->sku_cap_band_52GHz_enable) {
+       if (!data->sku_cap_11n_enable && !data->sku_cap_band_24ghz_enable &&
+           !data->sku_cap_band_52ghz_enable) {
                IWL_ERR(priv, "Invalid device sku\n");
                return -EINVAL;
        }
 
        IWL_DEBUG_INFO(priv,
                       "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n",
-                      data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",
-                      data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",
+                      data->sku_cap_band_24ghz_enable ? "" : "NOT", "enabled",
+                      data->sku_cap_band_52ghz_enable ? "" : "NOT", "enabled",
                       data->sku_cap_11n_enable ? "" : "NOT", "enabled");
 
        priv->hw_params.tx_chains_num =

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/nvm.c b/drivers/net/wireless/intel/iwlwifi/fw/nvm.c
index beefb89194a9c38d02176109d367dbff5f2c8026..b8d88df27b1805100b33896fe727df67fe8a5f56 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/nvm.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/nvm.c
@@ -134,9 +134,9 @@ struct iwl_nvm_data *iwl_fw_get_nvm(struct iwl_fw_runtime *fwrt)
                !!(mac_flags & NVM_MAC_SKU_FLAGS_802_11N_ENABLED);
        nvm->sku_cap_11ax_enable =
                !!(mac_flags & NVM_MAC_SKU_FLAGS_802_11AX_ENABLED);
-       nvm->sku_cap_band_24GHz_enable =
+       nvm->sku_cap_band_24ghz_enable =
                !!(mac_flags & NVM_MAC_SKU_FLAGS_BAND_2_4_ENABLED);
-       nvm->sku_cap_band_52GHz_enable =
+       nvm->sku_cap_band_52ghz_enable =
                !!(mac_flags & NVM_MAC_SKU_FLAGS_BAND_5_2_ENABLED);
        nvm->sku_cap_mimo_disabled =
                !!(mac_flags & NVM_MAC_SKU_FLAGS_MIMO_DISABLED);

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
index 3199d345b4274782765f2cf820c7b33f6b9a1224..777f5df8a0c6402cd69b55610fdf49e08f619745 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
@@ -899,8 +899,8 @@ iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg,
                                 EEPROM_SKU_CAP);
        data->sku_cap_11n_enable = sku & EEPROM_SKU_CAP_11N_ENABLE;
        data->sku_cap_amt_enable = sku & EEPROM_SKU_CAP_AMT_ENABLE;
-       data->sku_cap_band_24GHz_enable = sku & EEPROM_SKU_CAP_BAND_24GHZ;
-       data->sku_cap_band_52GHz_enable = sku & EEPROM_SKU_CAP_BAND_52GHZ;
+       data->sku_cap_band_24ghz_enable = sku & EEPROM_SKU_CAP_BAND_24GHZ;
+       data->sku_cap_band_52ghz_enable = sku & EEPROM_SKU_CAP_BAND_52GHZ;
        data->sku_cap_ipan_enable = sku & EEPROM_SKU_CAP_IPAN_ENABLE;
        if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL)
                data->sku_cap_11n_enable = false;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h
index 16bea75e82f12edc977e58290d6a29769d94a78e..8be50ed12300f5b16df34be38c9ad7d7ca5b41eb 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h
@@ -81,8 +81,8 @@ struct iwl_nvm_data {
        __le16 kelvin_voltage;
        __le16 xtal_calib[2];
 
-       bool sku_cap_band_24GHz_enable;
-       bool sku_cap_band_52GHz_enable;
+       bool sku_cap_band_24ghz_enable;
+       bool sku_cap_band_52ghz_enable;
        bool sku_cap_11n_enable;
        bool sku_cap_11ac_enable;
        bool sku_cap_11ax_enable;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 735b211364d2cfc663d4b0e2311173589558e8a8..a6246dc9f025c19d0efd05fa5790da3107594de5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -319,7 +319,7 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
 
                ch_flags = __le16_to_cpup(nvm_ch_flags + ch_idx);
 
-               if (is_5ghz && !data->sku_cap_band_52GHz_enable)
+               if (is_5ghz && !data->sku_cap_band_52ghz_enable)
                        continue;
 
                /* workaround to disable wide channels in 5GHz */
@@ -745,8 +745,8 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,
                rx_chains &= data->valid_rx_ant;
 
        sku = iwl_get_sku(cfg, nvm_sw, phy_sku);
-       data->sku_cap_band_24GHz_enable = sku & NVM_SKU_CAP_BAND_24GHZ;
-       data->sku_cap_band_52GHz_enable = sku & NVM_SKU_CAP_BAND_52GHZ;
+       data->sku_cap_band_24ghz_enable = sku & NVM_SKU_CAP_BAND_24GHZ;
+       data->sku_cap_band_52ghz_enable = sku & NVM_SKU_CAP_BAND_52GHZ;
        data->sku_cap_11n_enable = sku & NVM_SKU_CAP_11N_ENABLE;
        if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL)
                data->sku_cap_11n_enable = false;