2011-05-23 13:54:14

by Mike McCormack

[permalink] [raw]
Subject: [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(-)

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
index abe0fcc..544e0b7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
@@ -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;
}

diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
index 9a3d023..7285290 100644
--- 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 63b45e6..2ad51b0 100644
--- 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 693395e..0321328 100644
--- 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;
--
1.7.4.1




2011-05-23 19:46:30

by Larry Finger

[permalink] [raw]
Subject: Re: [PATCH 2/8] rtlwifi: Remove set_rfpowerstate_inprogress

On 05/23/2011 08:53 AM, Mike McCormack wrote:
> 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(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
> index abe0fcc..544e0b7 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
> @@ -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;
> }
>
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
> index 9a3d023..7285290 100644
> --- 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 63b45e6..2ad51b0 100644
> --- 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 693395e..0321328 100644
> --- 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;

Signed-off-by: Larry Finger <[email protected]>
---

Larry