Skip to contentSkip to conversation

rtlwifi: Remove set_rfpowerstate_inprogress

PATCH In review Mike McCormack 2 participants 2 messages May 23, 2011 Networking drivers (wireless)

lore
Share & tools
lore

Mike McCormack

author
#0 lore raw

PATCH 2/8 rtlwifi: Remove set_rfpowerstate_inprogress

set_rfpowerstate_inprogress is only set and never read so remove it.

Signed-off-by Mike McCormack <[email protected]>
---
 drivers/net/wireless/rtlwifi/rtl8192ce/phy.c |    2 --
 drivers/net/wireless/rtlwifi/rtl8192cu/phy.c |    2 --
 drivers/net/wireless/rtlwifi/rtl8192se/phy.c |    4 ----
 drivers/net/wireless/rtlwifi/wifi.h          |    1 -
 4 files changed, 0 insertions(+), 9 deletions(-)
drivers/net/wireless/rtlwifi/rtl8192ce/phy.c +0 -2
index abe0fcc..544e0b7 100644
@@ -521,7 +521,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) &&

@@ -617,7 +616,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;
 }
drivers/net/wireless/rtlwifi/rtl8192cu/phy.c +0 -2
index 9a3d023..7285290 100644
@@ -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;
 }
drivers/net/wireless/rtlwifi/rtl8192se/phy.c +0 -4
index 63b45e6..2ad51b0 100644
@@ -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;
 }
drivers/net/wireless/rtlwifi/wifi.h +0 -1
index 693395e..0321328 100644
@@ -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;
Signature · 1 line
1.7.4.1
#1 lore raw
Quoted 78 lines · Mike McCormack

set_rfpowerstate_inprogress is only set and never read so remove it.

Signed-off-by Mike McCormack<[email protected]>
---
  drivers/net/wireless/rtlwifi/rtl8192ce/phy.c |    2 --
  drivers/net/wireless/rtlwifi/rtl8192cu/phy.c |    2 --
  drivers/net/wireless/rtlwifi/rtl8192se/phy.c |    4 ----
  drivers/net/wireless/rtlwifi/wifi.h          |    1 -
  4 files changed, 0 insertions(+), 9 deletions(-)
drivers/net/wireless/rtlwifi/rtl8192ce/phy.c +0 -2
index abe0fcc..544e0b7 100644
@@ -521,7 +521,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)&&

@@ -617,7 +616,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;
  }
drivers/net/wireless/rtlwifi/rtl8192cu/phy.c +0 -2
index 9a3d023..7285290 100644
@@ -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;
  }
drivers/net/wireless/rtlwifi/rtl8192se/phy.c +0 -4
index 63b45e6..2ad51b0 100644
@@ -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;
  }
drivers/net/wireless/rtlwifi/wifi.h +0 -0
index 693395e..0321328 100644

drivers/net/wireless/rtlwifi/wifi.h struct rtl_efuse { · line 1193

Quoted 7 lines
drivers/net/wireless/rtlwifi/wifi.h +0 -1
@@ -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;
Signed-off-by Larry Finger <[email protected]>

---

Larry