staging: rtl8192e: Remove SetRFPowerStateInProgress

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8192e/r8190_rtl8256.c b/drivers/staging/rtl8192e/r8190_rtl8256.c
index 40a169df512350421ca6e451ca8c7f456bd5a10e..0b6c7f9786fb23d78735b65837a91a34f1ee3a56 100644 (file)
--- a/drivers/staging/rtl8192e/r8190_rtl8256.c
+++ b/drivers/staging/rtl8192e/r8190_rtl8256.c
@@ -328,11 +328,6 @@ SetRFPowerState8190(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState)
        bool bResult = true;
 
        spin_lock(&priv->ps_lock);
-       if (priv->SetRFPowerStateInProgress) {
-               bResult = false;
-               goto out;
-       }
-       priv->SetRFPowerStateInProgress = true;
 
        switch( eRFPowerState )
        {
@@ -428,7 +423,6 @@ SetRFPowerState8190(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState)
        }
 
 out:
-       priv->SetRFPowerStateInProgress = false;
        spin_unlock(&priv->ps_lock);
        return bResult;
 }

diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index 220f2b11424e2aa2f9213d40f493f3effc47d764..0c20fae493ddc33b14e03c2e513319e95b4a090b 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@ -1011,7 +1011,6 @@ typedef struct r8192_priv
        bool bHwRadioOff;
        //by amy for ps
        bool RFChangeInProgress; // RF Chnage in progress, by Bruce, 2007-10-30
-       bool SetRFPowerStateInProgress;
        RT_OP_MODE OpMode;
        //by amy for reset_count
        u32 reset_count;

diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 8f68ac07b5675ad3fafd3881016ecd0c1a890261..ec68f948cb5ddfeebe6d1b90bd847c1fe3fe05ce 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -1986,7 +1986,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
        priv->ieee80211->RfOffReason = 0;
        priv->RFChangeInProgress = false;
        priv->bHwRfOffAction = 0;
-       priv->SetRFPowerStateInProgress = false;
        priv->ieee80211->PowerSaveControl.bInactivePs = true;
        priv->ieee80211->PowerSaveControl.bIPSModeBackup = false;