diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-02-08 18:57:39 -0500 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-02-17 13:58:31 -0500 |
commit | dd63b84eb44ba4e34daa83cf535a8bb79bc7f2e2 (patch) | |
tree | 72d3e69727c54f3f52499f76adf6d632ed9039a0 /drivers/net | |
parent | dae66d0d2ee1a188fcfd437c4e6b2bf32dc7a1b2 (diff) |
iwlwifi: remove un-necessary return
Already return 0, change to void
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 6dff9c41c555..f3b72bc84d25 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -643,7 +643,7 @@ u8 iwl_get_single_channel_number(struct iwl_priv *priv, | |||
643 | * NOTE: Does not commit to the hardware; it sets appropriate bit fields | 643 | * NOTE: Does not commit to the hardware; it sets appropriate bit fields |
644 | * in the staging RXON flag structure based on the ch->band | 644 | * in the staging RXON flag structure based on the ch->band |
645 | */ | 645 | */ |
646 | int iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch, | 646 | void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch, |
647 | struct iwl_rxon_context *ctx) | 647 | struct iwl_rxon_context *ctx) |
648 | { | 648 | { |
649 | enum ieee80211_band band = ch->band; | 649 | enum ieee80211_band band = ch->band; |
@@ -651,7 +651,7 @@ int iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch, | |||
651 | 651 | ||
652 | if ((le16_to_cpu(ctx->staging.channel) == channel) && | 652 | if ((le16_to_cpu(ctx->staging.channel) == channel) && |
653 | (priv->band == band)) | 653 | (priv->band == band)) |
654 | return 0; | 654 | return; |
655 | 655 | ||
656 | ctx->staging.channel = cpu_to_le16(channel); | 656 | ctx->staging.channel = cpu_to_le16(channel); |
657 | if (band == IEEE80211_BAND_5GHZ) | 657 | if (band == IEEE80211_BAND_5GHZ) |
@@ -663,7 +663,6 @@ int iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch, | |||
663 | 663 | ||
664 | IWL_DEBUG_INFO(priv, "Staging channel set to %d [%d]\n", channel, band); | 664 | IWL_DEBUG_INFO(priv, "Staging channel set to %d [%d]\n", channel, band); |
665 | 665 | ||
666 | return 0; | ||
667 | } | 666 | } |
668 | 667 | ||
669 | void iwl_set_flags_for_band(struct iwl_priv *priv, | 668 | void iwl_set_flags_for_band(struct iwl_priv *priv, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 49370dd37768..930e247bbae6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -169,7 +169,7 @@ void iwl_set_rxon_hwcrypto(struct iwl_priv *priv, struct iwl_rxon_context *ctx, | |||
169 | int hw_decrypt); | 169 | int hw_decrypt); |
170 | int iwl_check_rxon_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx); | 170 | int iwl_check_rxon_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx); |
171 | int iwl_full_rxon_required(struct iwl_priv *priv, struct iwl_rxon_context *ctx); | 171 | int iwl_full_rxon_required(struct iwl_priv *priv, struct iwl_rxon_context *ctx); |
172 | int iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch, | 172 | void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch, |
173 | struct iwl_rxon_context *ctx); | 173 | struct iwl_rxon_context *ctx); |
174 | void iwl_set_flags_for_band(struct iwl_priv *priv, | 174 | void iwl_set_flags_for_band(struct iwl_priv *priv, |
175 | struct iwl_rxon_context *ctx, | 175 | struct iwl_rxon_context *ctx, |