From 0d65112ac0f083c77514c9e83958860d542b1d1a Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Thu, 3 Mar 2011 22:41:12 +0900 Subject: [PATCH] staging: rtl8192e: Remove unnecessary ps_lock Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/r8190_rtl8256.c | 3 --- drivers/staging/rtl8192e/r8192E.h | 1 - drivers/staging/rtl8192e/r8192E_core.c | 9 ++------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/r8190_rtl8256.c b/drivers/staging/rtl8192e/r8190_rtl8256.c index 9513af9268cb..0838bec7b682 100644 --- a/drivers/staging/rtl8192e/r8190_rtl8256.c +++ b/drivers/staging/rtl8192e/r8190_rtl8256.c @@ -327,8 +327,6 @@ SetRFPowerState8190(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState) PRT_POWER_SAVE_CONTROL pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->ieee80211->PowerSaveControl)); bool bResult = true; - spin_lock(&priv->ps_lock); - if (eRFPowerState == priv->ieee80211->eRFPowerState && priv->bHwRfOffAction == 0) { bResult = false; @@ -429,7 +427,6 @@ SetRFPowerState8190(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState) } out: - spin_unlock(&priv->ps_lock); return bResult; } diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h index 4278091a9b15..9b93ed9a5750 100644 --- a/drivers/staging/rtl8192e/r8192E.h +++ b/drivers/staging/rtl8192e/r8192E.h @@ -808,7 +808,6 @@ typedef struct r8192_priv spinlock_t irq_th_lock; spinlock_t rf_ps_lock; struct mutex mutex; - spinlock_t ps_lock; short chan; short sens; diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index 0c88a2592e56..cc20e5d7f5af 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -1883,8 +1883,6 @@ static void rtl8192_hw_to_sleep(struct net_device *dev, u32 th, u32 tl) u32 tmp; u32 rb = jiffies; - spin_lock(&priv->ps_lock); - // Writing HW register with 0 equals to disable // the timer, that is not really what we want // @@ -1897,14 +1895,14 @@ static void rtl8192_hw_to_sleep(struct net_device *dev, u32 th, u32 tl) if(((tl>=rb)&& (tl-rb) <= MSECS(MIN_SLEEP_TIME)) ||((rb>tl)&& (rb-tl) < MSECS(MIN_SLEEP_TIME))) { printk("too short to sleep::%x, %x, %lx\n",tl, rb, MSECS(MIN_SLEEP_TIME)); - goto out_unlock; + return; } if(((tl > rb) && ((tl-rb) > MSECS(MAX_SLEEP_TIME)))|| ((tl < rb) && (tl>MSECS(69)) && ((rb-tl) > MSECS(MAX_SLEEP_TIME)))|| ((tlMSECS(MAX_SLEEP_TIME)))) { printk("========>too long to sleep:%x, %x, %lx\n", tl, rb, MSECS(MAX_SLEEP_TIME)); - goto out_unlock; + return; } tmp = (tl>rb)?(tl-rb):(rb-tl); @@ -1913,8 +1911,6 @@ static void rtl8192_hw_to_sleep(struct net_device *dev, u32 th, u32 tl) queue_delayed_work(priv->ieee80211->wq, (void *)&priv->ieee80211->hw_sleep_wq,0); -out_unlock: - spin_unlock(&priv->ps_lock); } static void rtl8192_init_priv_variable(struct net_device* dev) @@ -2043,7 +2039,6 @@ static void rtl8192_init_priv_lock(struct r8192_priv* priv) { spin_lock_init(&priv->irq_th_lock); spin_lock_init(&priv->rf_ps_lock); - spin_lock_init(&priv->ps_lock); sema_init(&priv->wx_sem,1); sema_init(&priv->rf_sem,1); mutex_init(&priv->mutex); -- 2.34.1