staging: rtl8192e: Remove dead code from rtl8192_set_chan()

[~andy/linux] / drivers / staging / rtl8192e / r8192E_core.c

diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 660baf0cd52fa33fe0b354044bae204b79089991..58e7037b8b7258ddd9499059e07f78c01f0a836c 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -25,7 +25,6 @@
  */
 
 
-#undef LOOP_TEST
 #undef RX_DONT_PASS_UL
 #undef DEBUG_EPROM
 #undef DEBUG_RX_VERBOSE
@@ -484,14 +483,6 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
 
 }
 
-/*
- * this might still called in what was the PHY rtl8185/rtl8192 common code
- * plans are to possibilty turn it again in one common code...
- */
-void force_pci_posting(struct net_device *dev)
-{
-}
-
 static struct proc_dir_entry *rtl8192_proc = NULL;
 
 static int proc_get_stats_ap(char *page, char **start,
@@ -814,24 +805,9 @@ void rtl8192_irq_disable(struct net_device *dev)
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
 
        write_nic_dword(dev,INTA_MASK,0);
-       force_pci_posting(dev);
        priv->irq_enabled = 0;
 }
 
-
-#if 0
-static void rtl8192_set_mode(struct net_device *dev,int mode)
-{
-       u8 ecmd;
-       ecmd=read_nic_byte(dev, EPROM_CMD);
-       ecmd=ecmd &~ EPROM_CMD_OPERATING_MODE_MASK;
-       ecmd=ecmd | (mode<<EPROM_CMD_OPERATING_MODE_SHIFT);
-       ecmd=ecmd &~ (1<<EPROM_CS_SHIFT);
-       ecmd=ecmd &~ (1<<EPROM_CK_SHIFT);
-       write_nic_byte(dev, EPROM_CMD, ecmd);
-}
-#endif
-
 void rtl8192_update_msr(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -862,36 +838,14 @@ void rtl8192_update_msr(struct net_device *dev)
 
 void rtl8192_set_chan(struct net_device *dev,short ch)
 {
-    struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-    RT_TRACE(COMP_RF, "=====>%s()====ch:%d\n", __FUNCTION__, ch);
-    priv->chan=ch;
-#if 0
-    if(priv->ieee80211->iw_mode == IW_MODE_ADHOC ||
-            priv->ieee80211->iw_mode == IW_MODE_MASTER){
-
-        priv->ieee80211->link_state = WLAN_LINK_ASSOCIATED;
-        priv->ieee80211->master_chan = ch;
-        rtl8192_update_beacon_ch(dev);
-    }
-#endif
-
-    /* this hack should avoid frame TX during channel setting*/
-
-
-    // tx = read_nic_dword(dev,TX_CONF);
-    // tx &= ~TX_LOOPBACK_MASK;
+       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
 
-#ifndef LOOP_TEST
-    //TODO
-    // write_nic_dword(dev,TX_CONF, tx |( TX_LOOPBACK_MAC<<TX_LOOPBACK_SHIFT));
+       priv->chan = ch;
 
-    //need to implement rf set channel here WB
+       /* need to implement rf set channel here WB */
 
-    if (priv->rf_set_chan)
-        priv->rf_set_chan(dev,priv->chan);
-    // mdelay(10);
-    // write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));
-#endif
+       if (priv->rf_set_chan)
+               priv->rf_set_chan(dev, priv->chan);
 }
 
 void rtl8192_rx_enable(struct net_device *dev)
@@ -1071,27 +1025,10 @@ inline u16 rtl8192_rate2rate(short rate)
 
 static void rtl8192_data_hard_stop(struct net_device *dev)
 {
-       //FIXME !!
-       #if 0
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-       priv->dma_poll_mask |= (1<<TX_DMA_STOP_LOWPRIORITY_SHIFT);
-       rtl8192_set_mode(dev,EPROM_CMD_CONFIG);
-       write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);
-       rtl8192_set_mode(dev,EPROM_CMD_NORMAL);
-       #endif
 }
 
-
 static void rtl8192_data_hard_resume(struct net_device *dev)
 {
-       // FIXME !!
-       #if 0
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-       priv->dma_poll_mask &= ~(1<<TX_DMA_STOP_LOWPRIORITY_SHIFT);
-       rtl8192_set_mode(dev,EPROM_CMD_CONFIG);
-       write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);
-       rtl8192_set_mode(dev,EPROM_CMD_NORMAL);
-       #endif
 }
 
 /*
@@ -6538,7 +6475,6 @@ static irqreturn_t rtl8192_interrupt(int irq, void *netdev)
         rtl8192_try_wake_queue(dev, VO_QUEUE);
     }
 
-    force_pci_posting(dev);
     spin_unlock_irqrestore(&priv->irq_th_lock,flags);
 
     return IRQ_HANDLED;