diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-01 10:18:00 -0500 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-12 03:57:36 -0400 |
| commit | e70fe7eb9dec9c7b7c570a489f198b93b5ca609b (patch) | |
| tree | 320a6ac8ed830a80a49906c9f3582862886b98c6 /drivers/net/wireless/iwlwifi/dvm | |
| parent | 6a65bd534e5844d42d432eb41ee04e2a242bfc60 (diff) | |
iwlwifi: fix smatch warning: warn: inconsistent indenting
While at it, fix a few checkpatch issues.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rs.c | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/tx.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c index 32b78a66536d..3bd7c86e90d9 100644 --- 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, | |||
| 3153 | desc += sprintf(buff+desc, "lq type %s\n", | 3153 | desc += sprintf(buff+desc, "lq type %s\n", |
| 3154 | (is_legacy(tbl->lq_type)) ? "legacy" : "HT"); | 3154 | (is_legacy(tbl->lq_type)) ? "legacy" : "HT"); |
| 3155 | if (is_Ht(tbl->lq_type)) { | 3155 | if (is_Ht(tbl->lq_type)) { |
| 3156 | desc += sprintf(buff+desc, " %s", | 3156 | desc += sprintf(buff + desc, " %s", |
| 3157 | (is_siso(tbl->lq_type)) ? "SISO" : | 3157 | (is_siso(tbl->lq_type)) ? "SISO" : |
| 3158 | ((is_mimo2(tbl->lq_type)) ? "MIMO2" : "MIMO3")); | 3158 | ((is_mimo2(tbl->lq_type)) ? "MIMO2" : "MIMO3")); |
| 3159 | desc += sprintf(buff+desc, " %s", | 3159 | desc += sprintf(buff + desc, " %s", |
| 3160 | (tbl->is_ht40) ? "40MHz" : "20MHz"); | 3160 | (tbl->is_ht40) ? "40MHz" : "20MHz"); |
| 3161 | desc += sprintf(buff+desc, " %s %s %s\n", (tbl->is_SGI) ? "SGI" : "", | 3161 | desc += sprintf(buff + desc, " %s %s %s\n", |
| 3162 | (tbl->is_SGI) ? "SGI" : "", | ||
| 3162 | (lq_sta->is_green) ? "GF enabled" : "", | 3163 | (lq_sta->is_green) ? "GF enabled" : "", |
| 3163 | (lq_sta->is_agg) ? "AGG on" : ""); | 3164 | (lq_sta->is_agg) ? "AGG on" : ""); |
| 3164 | } | 3165 | } |
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c index 1e40a12de077..275df12a6045 100644 --- 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, | |||
| 189 | rate_flags |= RATE_MCS_CCK_MSK; | 189 | rate_flags |= RATE_MCS_CCK_MSK; |
| 190 | 190 | ||
| 191 | /* Set up antennas */ | 191 | /* Set up antennas */ |
| 192 | if (priv->lib->bt_params && | 192 | if (priv->lib->bt_params && |
| 193 | priv->lib->bt_params->advanced_bt_coexist && | 193 | priv->lib->bt_params->advanced_bt_coexist && |
| 194 | priv->bt_full_concurrent) { | 194 | priv->bt_full_concurrent) { |
| 195 | /* operated as 1x1 in full concurrency mode */ | 195 | /* operated as 1x1 in full concurrency mode */ |
| 196 | priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant, | 196 | priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant, |
| 197 | first_antenna(priv->nvm_data->valid_tx_ant)); | 197 | first_antenna(priv->nvm_data->valid_tx_ant)); |
