iwlegacy: remove il_ieee80211_get_hw_conf

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index ae60410ab708f3b5e8c480fb364df96bc6226f7a..cd7ae586b6630f526272e891462df67c67c7a6aa 100644 (file)
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -2759,7 +2759,7 @@ void il3945_post_associate(struct il_priv *il)
 
        il_scan_cancel_timeout(il, 200);
 
-       conf = il_ieee80211_get_hw_conf(il->hw);
+       conf = &il->hw->conf;
 
        ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
        il3945_commit_rxon(il, ctx);

diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c
index ed2c61776fd379d903048ef75df39011b4c9bbd1..6833a3c164e90236b062e9e93d3a01feb8064713 100644 (file)
--- a/drivers/net/wireless/iwlegacy/4965.c
+++ b/drivers/net/wireless/iwlegacy/4965.c
@@ -2184,7 +2184,7 @@ static void il4965_post_associate(struct il_priv *il)
 
        il_scan_cancel_timeout(il, 200);
 
-       conf = il_ieee80211_get_hw_conf(il->hw);
+       conf = &il->hw->conf;
 
        ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
        il_commit_rxon(il, ctx);

diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 7062574df365ee2ecc46b818dea7b041500437ee..bbf674d2075b669505bb58b697cc4564b06f38f3 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -3514,7 +3514,7 @@ il_send_rxon_timing(struct il_priv *il, struct il_rxon_context *ctx)
        u16 beacon_int;
        struct ieee80211_vif *vif = ctx->vif;
 
-       conf = il_ieee80211_get_hw_conf(il->hw);
+       conf = &il->hw->conf;
 
        lockdep_assert_held(&il->mutex);
 

diff --git a/drivers/net/wireless/iwlegacy/iwl-helpers.h b/drivers/net/wireless/iwlegacy/iwl-helpers.h
index 0e64003274f486a2775f0520c0444a11d27c2457..eb5a287f2254ffddd49242bff6067f4b5e18d11b 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl-helpers.h
+++ b/drivers/net/wireless/iwlegacy/iwl-helpers.h
@@ -38,12 +38,6 @@
 #define IL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
 
 
-static inline struct ieee80211_conf *il_ieee80211_get_hw_conf(
-       struct ieee80211_hw *hw)
-{
-       return &hw->conf;
-}
-
 /**
  * il_queue_inc_wrap - increment queue idx, wrap back to beginning
  * @idx -- current idx