On Fri, 2010-09-10 at 07:26 -0700, Stanislaw Gruszka wrote: > From: Johannes Berg <johannes.berg@xxxxxxxxx> > > There are a number of conf variables that are > unused, remove them. > > Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> > Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx> Acked-by: Wey-Yi W Guy <wey-yi.w.guy@xxxxxxxxx> > --- > drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 3 --- > drivers/net/wireless/iwlwifi/iwl3945-base.c | 6 ------ > 2 files changed, 0 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > index a8f2adf..51a8d7e 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c > @@ -1162,7 +1162,6 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) > .flags = CMD_SIZE_HUGE, > }; > struct iwl_scan_cmd *scan; > - struct ieee80211_conf *conf = NULL; > struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; > u32 rate_flags = 0; > u16 cmd_len; > @@ -1179,8 +1178,6 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) > if (vif) > ctx = iwl_rxon_ctx_from_vif(vif); > > - conf = ieee80211_get_hw_conf(priv->hw); > - > cancel_delayed_work(&priv->scan_check); > > if (!iwl_is_ready(priv)) { > diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c > index 68e624a..5b742eb 100644 > --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c > +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c > @@ -2569,12 +2569,9 @@ static void __iwl3945_down(struct iwl_priv *priv) > { > unsigned long flags; > int exit_pending = test_bit(STATUS_EXIT_PENDING, &priv->status); > - struct ieee80211_conf *conf = NULL; > > IWL_DEBUG_INFO(priv, DRV_NAME " is going down\n"); > > - conf = ieee80211_get_hw_conf(priv->hw); > - > if (!exit_pending) > set_bit(STATUS_EXIT_PENDING, &priv->status); > > @@ -2828,13 +2825,10 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) > .flags = CMD_SIZE_HUGE, > }; > struct iwl3945_scan_cmd *scan; > - struct ieee80211_conf *conf = NULL; > u8 n_probes = 0; > enum ieee80211_band band; > bool is_active = false; > > - conf = ieee80211_get_hw_conf(priv->hw); > - > cancel_delayed_work(&priv->scan_check); > > if (!iwl_is_ready(priv)) { -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html