iwlagn: refactor iwlagn_mac_channel_switch

Use less indentions and remove uneeded irq-save flags.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 52 insertions, 54 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 0b2d2cd4b54a..099c2795ec0b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2916,7 +2916,6 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
          */
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
         u16 ch;
-        unsigned long flags = 0;
 
         IWL_DEBUG_MAC80211(priv, "enter\n");
 
@@ -2933,65 +2932,64 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
         if (!iwl_is_associated_ctx(ctx))
                 goto out;
 
-        if (priv->cfg->ops->lib->set_channel_switch) {
+        if (!priv->cfg->ops->lib->set_channel_switch)
+                goto out;
 
-                ch = channel->hw_value;
-                if (le16_to_cpu(ctx->active.channel) != ch) {
-                        ch_info = iwl_get_channel_info(priv,
-                                                       channel->band,
-                                                       ch);
-                        if (!is_channel_valid(ch_info)) {
-                                IWL_DEBUG_MAC80211(priv, "invalid channel\n");
-                                goto out;
-                        }
-                        spin_lock_irqsave(&priv->lock, flags);
-
-                        priv->current_ht_config.smps = conf->smps_mode;
-
-                        /* Configure HT40 channels */
-                        ctx->ht.enabled = conf_is_ht(conf);
-                        if (ctx->ht.enabled) {
-                                if (conf_is_ht40_minus(conf)) {
-                                        ctx->ht.extension_chan_offset =
-                                                IEEE80211_HT_PARAM_CHA_SEC_BELOW;
-                                        ctx->ht.is_40mhz = true;
-                                } else if (conf_is_ht40_plus(conf)) {
-                                        ctx->ht.extension_chan_offset =
-                                                IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
-                                        ctx->ht.is_40mhz = true;
-                                } else {
-                                        ctx->ht.extension_chan_offset =
-                                                IEEE80211_HT_PARAM_CHA_SEC_NONE;
-                                        ctx->ht.is_40mhz = false;
-                                }
-                        } else
-                                ctx->ht.is_40mhz = false;
+        ch = channel->hw_value;
+        if (le16_to_cpu(ctx->active.channel) == ch)
+                goto out;
+
+        ch_info = iwl_get_channel_info(priv, channel->band, ch);
+        if (!is_channel_valid(ch_info)) {
+                IWL_DEBUG_MAC80211(priv, "invalid channel\n");
+                goto out;
+        }
 
-                        if ((le16_to_cpu(ctx->staging.channel) != ch))
-                                ctx->staging.flags = 0;
+        spin_lock_irq(&priv->lock);
 
-                        iwl_set_rxon_channel(priv, channel, ctx);
-                        iwl_set_rxon_ht(priv, ht_conf);
-                        iwl_set_flags_for_band(priv, ctx, channel->band,
-                                               ctx->vif);
-                        spin_unlock_irqrestore(&priv->lock, flags);
+        priv->current_ht_config.smps = conf->smps_mode;
 
-                        iwl_set_rate(priv);
-                        /*
-                         * at this point, staging_rxon has the
-                         * configuration for channel switch
-                         */
-                        set_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status);
-                        priv->switch_channel = cpu_to_le16(ch);
-                        if (priv->cfg->ops->lib->set_channel_switch(priv,
-                                                                    ch_switch)) {
-                                clear_bit(STATUS_CHANNEL_SWITCH_PENDING,
-                                          &priv->status);
-                                priv->switch_channel = 0;
-                                ieee80211_chswitch_done(ctx->vif, false);
-                        }
+        /* Configure HT40 channels */
+        ctx->ht.enabled = conf_is_ht(conf);
+        if (ctx->ht.enabled) {
+                if (conf_is_ht40_minus(conf)) {
+                        ctx->ht.extension_chan_offset =
+                                IEEE80211_HT_PARAM_CHA_SEC_BELOW;
+                        ctx->ht.is_40mhz = true;
+                } else if (conf_is_ht40_plus(conf)) {
+                        ctx->ht.extension_chan_offset =
+                                IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
+                        ctx->ht.is_40mhz = true;
+                } else {
+                        ctx->ht.extension_chan_offset =
+                                IEEE80211_HT_PARAM_CHA_SEC_NONE;
+                        ctx->ht.is_40mhz = false;
                 }
+        } else
+                ctx->ht.is_40mhz = false;
+
+        if ((le16_to_cpu(ctx->staging.channel) != ch))
+                ctx->staging.flags = 0;
+
+        iwl_set_rxon_channel(priv, channel, ctx);
+        iwl_set_rxon_ht(priv, ht_conf);
+        iwl_set_flags_for_band(priv, ctx, channel->band, ctx->vif);
+
+        spin_unlock_irq(&priv->lock);
+
+        iwl_set_rate(priv);
+        /*
+         * at this point, staging_rxon has the
+         * configuration for channel switch
+         */
+        set_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status);
+        priv->switch_channel = cpu_to_le16(ch);
+        if (priv->cfg->ops->lib->set_channel_switch(priv, ch_switch)) {
+                clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status);
+                priv->switch_channel = 0;
+                ieee80211_chswitch_done(ctx->vif, false);
         }
+
 out:
         mutex_unlock(&priv->mutex);
         IWL_DEBUG_MAC80211(priv, "leave\n");