Signed-off-by: Mike McCormack <mikem@xxxxxxxxxx> --- drivers/staging/rtl8192e/r8192E.h | 16 ---------------- drivers/staging/rtl8192e/r8192E_core.c | 4 ---- drivers/staging/rtl8192e/r819xE_phy.c | 2 -- 3 files changed, 0 insertions(+), 22 deletions(-) diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h index 798a355..a93b0ee 100644 --- a/drivers/staging/rtl8192e/r8192E.h +++ b/drivers/staging/rtl8192e/r8192E.h @@ -986,12 +986,10 @@ typedef struct r8192_priv short hw_plcp_len; short plcp_preamble_mode; u8 ScanDelay; - spinlock_t irq_lock; spinlock_t irq_th_lock; spinlock_t tx_lock; spinlock_t rf_ps_lock; struct mutex mutex; - spinlock_t rf_lock; //used to lock rf write operation added by wb spinlock_t ps_lock; u32 irq_mask; @@ -1021,25 +1019,11 @@ typedef struct r8192_priv struct rtl8192_tx_ring tx_ring[MAX_TX_QUEUE_COUNT]; int txringcount; //{ - int txbuffsize; - int txfwbuffersize; //struct tx_pendingbuf txnp_pending; //struct tasklet_struct irq_tx_tasklet; struct tasklet_struct irq_rx_tasklet; struct tasklet_struct irq_tx_tasklet; struct tasklet_struct irq_prepare_beacon_tasklet; - struct buffer *txmapbufs; - struct buffer *txbkpbufs; - struct buffer *txbepbufs; - struct buffer *txvipbufs; - struct buffer *txvopbufs; - struct buffer *txcmdbufs; - struct buffer *txmapbufstail; - struct buffer *txbkpbufstail; - struct buffer *txbepbufstail; - struct buffer *txvipbufstail; - struct buffer *txvopbufstail; - struct buffer *txcmdbufstail; /* adhoc/master mode stuff */ ptx_ring txbeaconringtail; dma_addr_t txbeaconringdma; diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index 044e226..80a0e1f 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -2150,8 +2150,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->bHwRadioOff = false; priv->being_init_adapter = false; - priv->txbuffsize = 1600;//1024; - priv->txfwbuffersize = 4096; priv->txringcount = 64;//32; //priv->txbeaconcount = priv->txringcount; priv->txbeaconcount = 2; @@ -2301,11 +2299,9 @@ 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_lock);//added by thomas spin_lock_init(&priv->irq_th_lock); spin_lock_init(&priv->rf_ps_lock); spin_lock_init(&priv->ps_lock); - //spin_lock_init(&priv->rf_lock); sema_init(&priv->wx_sem,1); sema_init(&priv->rf_sem,1); mutex_init(&priv->mutex); diff --git a/drivers/staging/rtl8192e/r819xE_phy.c b/drivers/staging/rtl8192e/r819xE_phy.c index 50cd0e5..f75c907 100644 --- a/drivers/staging/rtl8192e/r819xE_phy.c +++ b/drivers/staging/rtl8192e/r819xE_phy.c @@ -1727,7 +1727,6 @@ void rtl8192_phy_SetRFReg(struct net_device* dev, RF90_RADIO_PATH_E eRFPath, u32 if(priv->ieee80211->eRFPowerState != eRfOn && !priv->being_init_adapter) return; #endif - //spin_lock_irqsave(&priv->rf_lock, flags); //down(&priv->rf_sem); RT_TRACE(COMP_PHY, "FW RF CTRL is not ready now\n"); @@ -1757,7 +1756,6 @@ void rtl8192_phy_SetRFReg(struct net_device* dev, RF90_RADIO_PATH_E eRFPath, u32 }else rtl8192_phy_RFSerialWrite(dev, eRFPath, RegAddr, Data); } - //spin_unlock_irqrestore(&priv->rf_lock, flags); //up(&priv->rf_sem); } -- 1.7.0.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel