iwlwifi: fix smatch warning: warn: inconsistent indenting

While at it, fix a few checkpatch issues.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c
index 32b78a66536db90bbb1e67f10e210df49f6b2d03..3bd7c86e90d9fca5c43c6a95ac7795ec74ddeaf7 100644 (file)
--- a/drivers/net/wireless/iwlwifi/dvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.c
@@ -3153,12 +3153,13 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
        desc += sprintf(buff+desc, "lq type %s\n",
           (is_legacy(tbl->lq_type)) ? "legacy" : "HT");
        if (is_Ht(tbl->lq_type)) {
-               desc += sprintf(buff+desc, " %s",
+               desc += sprintf(buff + desc, " %s",
                   (is_siso(tbl->lq_type)) ? "SISO" :
                   ((is_mimo2(tbl->lq_type)) ? "MIMO2" : "MIMO3"));
-                  desc += sprintf(buff+desc, " %s",
+               desc += sprintf(buff + desc, " %s",
                   (tbl->is_ht40) ? "40MHz" : "20MHz");
-                  desc += sprintf(buff+desc, " %s %s %s\n", (tbl->is_SGI) ? "SGI" : "",
+               desc += sprintf(buff + desc, " %s %s %s\n",
+                  (tbl->is_SGI) ? "SGI" : "",
                   (lq_sta->is_green) ? "GF enabled" : "",
                   (lq_sta->is_agg) ? "AGG on" : "");
        }

diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index 1e40a12de077237add85776ec6ad3c6fddf30857..275df12a6045044cdee1ddeba1c8840caf491923 100644 (file)
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -189,9 +189,9 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
                rate_flags |= RATE_MCS_CCK_MSK;
 
        /* Set up antennas */
-        if (priv->lib->bt_params &&
-            priv->lib->bt_params->advanced_bt_coexist &&
-            priv->bt_full_concurrent) {
+       if (priv->lib->bt_params &&
+           priv->lib->bt_params->advanced_bt_coexist &&
+           priv->bt_full_concurrent) {
                /* operated as 1x1 in full concurrency mode */
                priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
                                first_antenna(priv->nvm_data->valid_tx_ant));

diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index f1d73d5e6eff39d99fb1ee9ec68348b0504ade60..66ca000f0da107be26a2c9fe7f3ff76b7baad386 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -1014,34 +1014,34 @@ static int validate_sec_sizes(struct iwl_drv *drv,
 
        /* Verify that uCode images will fit in card's SRAM. */
        if (get_sec_size(pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_INST) >
-                                                       cfg->max_inst_size) {
+           cfg->max_inst_size) {
                IWL_ERR(drv, "uCode instr len %Zd too large to fit in\n",
                        get_sec_size(pieces, IWL_UCODE_REGULAR,
-                                               IWL_UCODE_SECTION_INST));
+                                    IWL_UCODE_SECTION_INST));
                return -1;
        }
 
        if (get_sec_size(pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_DATA) >
-                                                       cfg->max_data_size) {
+           cfg->max_data_size) {
                IWL_ERR(drv, "uCode data len %Zd too large to fit in\n",
                        get_sec_size(pieces, IWL_UCODE_REGULAR,
-                                               IWL_UCODE_SECTION_DATA));
+                                    IWL_UCODE_SECTION_DATA));
                return -1;
        }
 
-        if (get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_INST) >
-                                                       cfg->max_inst_size) {
+       if (get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_INST) >
+            cfg->max_inst_size) {
                IWL_ERR(drv, "uCode init instr len %Zd too large to fit in\n",
                        get_sec_size(pieces, IWL_UCODE_INIT,
-                                               IWL_UCODE_SECTION_INST));
+                                    IWL_UCODE_SECTION_INST));
                return -1;
        }
 
        if (get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_DATA) >
-                                                       cfg->max_data_size) {
+           cfg->max_data_size) {
                IWL_ERR(drv, "uCode init data len %Zd too large to fit in\n",
                        get_sec_size(pieces, IWL_UCODE_REGULAR,
-                                               IWL_UCODE_SECTION_DATA));
+                                    IWL_UCODE_SECTION_DATA));
                return -1;
        }
        return 0;

diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index 6578498dd5afde7ee13915f6e954cbfb84a3239d..d8dacb3be10a07fe29a6c50e5c9dbb7c1a3048ab 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -3343,16 +3343,16 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
                        (is_legacy(rate)) ? "legacy" :
                        is_vht(rate) ? "VHT" : "HT");
        if (!is_legacy(rate)) {
-               desc += sprintf(buff+desc, " %s",
+               desc += sprintf(buff + desc, " %s",
                   (is_siso(rate)) ? "SISO" : "MIMO2");
-                  desc += sprintf(buff+desc, " %s",
-                                  (is_ht20(rate)) ? "20MHz" :
-                                  (is_ht40(rate)) ? "40MHz" :
-                                  (is_ht80(rate)) ? "80Mhz" : "BAD BW");
-                  desc += sprintf(buff+desc, " %s %s %s\n",
-                                  (rate->sgi) ? "SGI" : "NGI",
-                                  (rate->ldpc) ? "LDPC" : "BCC",
-                                  (lq_sta->is_agg) ? "AGG on" : "");
+               desc += sprintf(buff + desc, " %s",
+                               (is_ht20(rate)) ? "20MHz" :
+                               (is_ht40(rate)) ? "40MHz" :
+                               (is_ht80(rate)) ? "80Mhz" : "BAD BW");
+               desc += sprintf(buff + desc, " %s %s %s\n",
+                               (rate->sgi) ? "SGI" : "NGI",
+                               (rate->ldpc) ? "LDPC" : "BCC",
+                               (lq_sta->is_agg) ? "AGG on" : "");
        }
        desc += sprintf(buff+desc, "last tx rate=0x%X\n",
                        lq_sta->last_rate_n_flags);