rtlwifi: Remove set_rfpowerstate_inprogress

set_rfpowerstate_inprogress is only set and never read
so remove it.

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
index c5be547ad7105f1619a3f27c2aac6f817a70996d..dde619e2994f5071ee6fa293f40261d5429a26a5 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
@@ -519,7 +519,6 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
        u8 i, queue_id;
        struct rtl8192_tx_ring *ring = NULL;
 
-       ppsc->set_rfpowerstate_inprogress = true;
        switch (rfpwr_state) {
        case ERFON:{
                        if ((ppsc->rfpwr_state == ERFOFF) &&
@@ -615,7 +614,6 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
        }
        if (bresult)
                ppsc->rfpwr_state = rfpwr_state;
-       ppsc->set_rfpowerstate_inprogress = false;
        return bresult;
 }
 

diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
index 9a3d0239e27e6ae7aa8b1c8665bba3afcabc3279..72852900df84f4dbcd40d40887ae67a645731816 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
@@ -470,7 +470,6 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
        u8 i, queue_id;
        struct rtl8192_tx_ring *ring = NULL;
 
-       ppsc->set_rfpowerstate_inprogress = true;
        switch (rfpwr_state) {
        case ERFON:
                if ((ppsc->rfpwr_state == ERFOFF) &&
@@ -590,7 +589,6 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
        }
        if (bresult)
                ppsc->rfpwr_state = rfpwr_state;
-       ppsc->set_rfpowerstate_inprogress = false;
        return bresult;
 }
 

diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index a26713b5afb51f50d382a514a03b9925dfcbbe05..fd969fd0e5cd06ef42ea469cda2c97dec3e2b502 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
@@ -546,8 +546,6 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
        if (rfpwr_state == ppsc->rfpwr_state)
                return false;
 
-       ppsc->set_rfpowerstate_inprogress = true;
-
        switch (rfpwr_state) {
        case ERFON:{
                        if ((ppsc->rfpwr_state == ERFOFF) &&
@@ -659,8 +657,6 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
        if (bresult)
                ppsc->rfpwr_state = rfpwr_state;
 
-       ppsc->set_rfpowerstate_inprogress = false;
-
        return bresult;
 }
 

diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 693395ee98f9d75c1687afb8594c7716878d7907..03213285f77b26418240ec06594b75b14e576007 100644 (file)
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1188,7 +1188,6 @@ struct rtl_efuse {
 
 struct rtl_ps_ctl {
        bool pwrdomain_protect;
-       bool set_rfpowerstate_inprogress;
        bool in_powersavemode;
        bool rfchange_inprogress;
        bool swrf_processing;