staging: rtl8192e: Remove unused tx_lock spin lock

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

3 files changed, 0 insertions, 10 deletions

diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index 81aea8816d3..33db522286d 100644
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@ -807,7 +807,6 @@ typedef struct r8192_priv
         u8 Rf_Mode;
         u8 card_8192_version; /* if TCR reports card V B/C this discriminates */
         spinlock_t irq_th_lock;
-        spinlock_t tx_lock;
         spinlock_t rf_ps_lock;
         struct mutex mutex;
         spinlock_t ps_lock;
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 630b1c7c8e7..613fbe4508b 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -2116,7 +2116,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
 
 static void rtl8192_init_priv_lock(struct r8192_priv* priv)
 {
-        spin_lock_init(&priv->tx_lock);
         spin_lock_init(&priv->irq_th_lock);
         spin_lock_init(&priv->rf_ps_lock);
         spin_lock_init(&priv->ps_lock);
@@ -3000,12 +2999,10 @@ static void rtl8192_prepare_beacon(unsigned long arg)
 {
         struct r8192_priv *priv = (struct r8192_priv*) arg;
         struct sk_buff *skb;
-        //unsigned long flags;
         cb_desc *tcb_desc;
 
         skb = ieee80211_get_beacon(priv->ieee80211);
         tcb_desc = (cb_desc *)(skb->cb + 8);
-        //spin_lock_irqsave(&priv->tx_lock,flags);
         /* prepare misc info for the beacon xmit */
         tcb_desc->queue_index = BEACON_QUEUE;
         /* IBSS does not support HT yet, use 1M defaultly */
@@ -3018,7 +3015,6 @@ static void rtl8192_prepare_beacon(unsigned long arg)
         if(skb){
                 rtl8192_tx(priv->ieee80211->dev,skb);
         }
-        //spin_unlock_irqrestore (&priv->tx_lock, flags);
 }
 
 
@@ -3747,7 +3743,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
        struct net_device *dev = priv->ieee80211->dev;
         struct ieee80211_device* ieee = priv->ieee80211;
         RESET_TYPE      ResetType = RESET_TYPE_NORESET;
-        unsigned long flags;
         bool bBusyTraffic = false;
         bool bEnterPS = false;
 
@@ -3840,14 +3835,12 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
               ieee->LinkDetectInfo.NumRecvDataInPeriod=0;
 
         //check if reset the driver
-        spin_lock_irqsave(&priv->tx_lock,flags);
         if (priv->watchdog_check_reset_cnt++ >= 3 && !ieee->is_roaming && 
             priv->watchdog_last_time != 1)
         {
                 ResetType = rtl819x_ifcheck_resetornot(dev);
                 priv->watchdog_check_reset_cnt = 3;
         }
-        spin_unlock_irqrestore(&priv->tx_lock,flags);
         if(!priv->bDisableNormalResetCheck && ResetType == RESET_TYPE_NORMAL)
         {
                 priv->ResetProgress = RESET_TYPE_NORMAL;
diff --git a/drivers/staging/rtl8192e/r819xE_cmdpkt.c b/drivers/staging/rtl8192e/r819xE_cmdpkt.c
index ef6f2deb304..d5e1e7ee7c5 100644
--- a/drivers/staging/rtl8192e/r819xE_cmdpkt.c
+++ b/drivers/staging/rtl8192e/r819xE_cmdpkt.c
@@ -52,7 +52,6 @@ RT_STATUS cmpk_message_handle_tx(
         PTX_FWINFO_8190PCI      pTxFwInfo = NULL;
         int i;
 
-        //spin_lock_irqsave(&priv->tx_lock,flags);
         RT_TRACE(COMP_CMDPKT,"%s(),buffer_len is %d\n",__FUNCTION__,buffer_len);
         firmware_init_param(dev);
         //Fragmentation might be required
@@ -113,7 +112,6 @@ RT_STATUS cmpk_message_handle_tx(
         }while(frag_offset < buffer_len);
 
 Failed:
-        //spin_unlock_irqrestore(&priv->tx_lock,flags);
         return rt_status;
 }