Commit e70fe7eb authored by Emmanuel Grumbach's avatar Emmanuel Grumbach

iwlwifi: fix smatch warning: warn: inconsistent indenting

While at it, fix a few checkpatch issues.
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 6a65bd53
...@@ -3153,12 +3153,13 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file, ...@@ -3153,12 +3153,13 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
desc += sprintf(buff+desc, "lq type %s\n", desc += sprintf(buff+desc, "lq type %s\n",
(is_legacy(tbl->lq_type)) ? "legacy" : "HT"); (is_legacy(tbl->lq_type)) ? "legacy" : "HT");
if (is_Ht(tbl->lq_type)) { if (is_Ht(tbl->lq_type)) {
desc += sprintf(buff+desc, " %s", desc += sprintf(buff + desc, " %s",
(is_siso(tbl->lq_type)) ? "SISO" : (is_siso(tbl->lq_type)) ? "SISO" :
((is_mimo2(tbl->lq_type)) ? "MIMO2" : "MIMO3")); ((is_mimo2(tbl->lq_type)) ? "MIMO2" : "MIMO3"));
desc += sprintf(buff+desc, " %s", desc += sprintf(buff + desc, " %s",
(tbl->is_ht40) ? "40MHz" : "20MHz"); (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_green) ? "GF enabled" : "",
(lq_sta->is_agg) ? "AGG on" : ""); (lq_sta->is_agg) ? "AGG on" : "");
} }
......
...@@ -189,9 +189,9 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv, ...@@ -189,9 +189,9 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
rate_flags |= RATE_MCS_CCK_MSK; rate_flags |= RATE_MCS_CCK_MSK;
/* Set up antennas */ /* Set up antennas */
if (priv->lib->bt_params && if (priv->lib->bt_params &&
priv->lib->bt_params->advanced_bt_coexist && priv->lib->bt_params->advanced_bt_coexist &&
priv->bt_full_concurrent) { priv->bt_full_concurrent) {
/* operated as 1x1 in full concurrency mode */ /* operated as 1x1 in full concurrency mode */
priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant, priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
first_antenna(priv->nvm_data->valid_tx_ant)); first_antenna(priv->nvm_data->valid_tx_ant));
......
...@@ -1014,34 +1014,34 @@ static int validate_sec_sizes(struct iwl_drv *drv, ...@@ -1014,34 +1014,34 @@ static int validate_sec_sizes(struct iwl_drv *drv,
/* Verify that uCode images will fit in card's SRAM. */ /* Verify that uCode images will fit in card's SRAM. */
if (get_sec_size(pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_INST) > 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", IWL_ERR(drv, "uCode instr len %Zd too large to fit in\n",
get_sec_size(pieces, IWL_UCODE_REGULAR, get_sec_size(pieces, IWL_UCODE_REGULAR,
IWL_UCODE_SECTION_INST)); IWL_UCODE_SECTION_INST));
return -1; return -1;
} }
if (get_sec_size(pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_DATA) > 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", IWL_ERR(drv, "uCode data len %Zd too large to fit in\n",
get_sec_size(pieces, IWL_UCODE_REGULAR, get_sec_size(pieces, IWL_UCODE_REGULAR,
IWL_UCODE_SECTION_DATA)); IWL_UCODE_SECTION_DATA));
return -1; return -1;
} }
if (get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_INST) > if (get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_INST) >
cfg->max_inst_size) { cfg->max_inst_size) {
IWL_ERR(drv, "uCode init instr len %Zd too large to fit in\n", IWL_ERR(drv, "uCode init instr len %Zd too large to fit in\n",
get_sec_size(pieces, IWL_UCODE_INIT, get_sec_size(pieces, IWL_UCODE_INIT,
IWL_UCODE_SECTION_INST)); IWL_UCODE_SECTION_INST));
return -1; return -1;
} }
if (get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_DATA) > 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", IWL_ERR(drv, "uCode init data len %Zd too large to fit in\n",
get_sec_size(pieces, IWL_UCODE_REGULAR, get_sec_size(pieces, IWL_UCODE_REGULAR,
IWL_UCODE_SECTION_DATA)); IWL_UCODE_SECTION_DATA));
return -1; return -1;
} }
return 0; return 0;
......
...@@ -3343,16 +3343,16 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file, ...@@ -3343,16 +3343,16 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
(is_legacy(rate)) ? "legacy" : (is_legacy(rate)) ? "legacy" :
is_vht(rate) ? "VHT" : "HT"); is_vht(rate) ? "VHT" : "HT");
if (!is_legacy(rate)) { if (!is_legacy(rate)) {
desc += sprintf(buff+desc, " %s", desc += sprintf(buff + desc, " %s",
(is_siso(rate)) ? "SISO" : "MIMO2"); (is_siso(rate)) ? "SISO" : "MIMO2");
desc += sprintf(buff+desc, " %s", desc += sprintf(buff + desc, " %s",
(is_ht20(rate)) ? "20MHz" : (is_ht20(rate)) ? "20MHz" :
(is_ht40(rate)) ? "40MHz" : (is_ht40(rate)) ? "40MHz" :
(is_ht80(rate)) ? "80Mhz" : "BAD BW"); (is_ht80(rate)) ? "80Mhz" : "BAD BW");
desc += sprintf(buff+desc, " %s %s %s\n", desc += sprintf(buff + desc, " %s %s %s\n",
(rate->sgi) ? "SGI" : "NGI", (rate->sgi) ? "SGI" : "NGI",
(rate->ldpc) ? "LDPC" : "BCC", (rate->ldpc) ? "LDPC" : "BCC",
(lq_sta->is_agg) ? "AGG on" : ""); (lq_sta->is_agg) ? "AGG on" : "");
} }
desc += sprintf(buff+desc, "last tx rate=0x%X\n", desc += sprintf(buff+desc, "last tx rate=0x%X\n",
lq_sta->last_rate_n_flags); lq_sta->last_rate_n_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment