---

yaml --- r: 219957 b: refs/heads/master c: cdeac5d h: refs/heads/master i: 219955: 207b1f6 v: v3
git-mirror · Sep 21, 2010 · a722fb9 · a722fb9
1 parent b549af6
commit a722fb9
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcf663fba428a95b43ddc6c996f987b032c5d291
+refs/heads/master: cdeac5df346a7281d90cfe6bdda610adfc4155e6
diff --git a/trunk/drivers/staging/rtl8192e/r8180_93cx6.c b/trunk/drivers/staging/rtl8192e/r8180_93cx6.c
@@ -30,7 +30,6 @@ static void eprom_cs(struct net_device *dev, short bit)
 		write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD)
 			       &~(1<<EPROM_CS_SHIFT)); //disable EPROM
 
-	force_pci_posting(dev);
 	udelay(EPROM_DELAY);
 }
 
@@ -39,11 +38,9 @@ static void eprom_ck_cycle(struct net_device *dev)
 {
 	write_nic_byte(dev, EPROM_CMD,
 		       (1<<EPROM_CK_SHIFT) | read_nic_byte(dev, EPROM_CMD));
-	force_pci_posting(dev);
 	udelay(EPROM_DELAY);
 	write_nic_byte(dev, EPROM_CMD,
 		       read_nic_byte(dev, EPROM_CMD) & ~(1<<EPROM_CK_SHIFT));
-	force_pci_posting(dev);
 	udelay(EPROM_DELAY);
 }
 
@@ -57,7 +54,6 @@ static void eprom_w(struct net_device *dev, short bit)
 		write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD)
 			       &~(1<<EPROM_W_SHIFT));
 
-	force_pci_posting(dev);
 	udelay(EPROM_DELAY);
 }
 
@@ -99,7 +95,6 @@ u32 eprom_read(struct net_device *dev, u32 addr)
         //enable EPROM programming
 	write_nic_byte(dev, EPROM_CMD,
 		       (EPROM_CMD_PROGRAM<<EPROM_CMD_OPERATING_MODE_SHIFT));
-	force_pci_posting(dev);
 	udelay(EPROM_DELAY);
 
 	if (priv->epromtype == EPROM_93c56) {

diff --git a/trunk/drivers/staging/rtl8192e/r8192E.h b/trunk/drivers/staging/rtl8192e/r8192E.h
@@ -1479,7 +1479,6 @@ void write_nic_byte(struct net_device *dev, int x,u8 y);
 void write_nic_byte_E(struct net_device *dev, int x,u8 y);
 void write_nic_word(struct net_device *dev, int x,u16 y);
 void write_nic_dword(struct net_device *dev, int x,u32 y);
-void force_pci_posting(struct net_device *dev);
 
 void rtl8192_halt_adapter(struct net_device *dev, bool reset);
 void rtl8192_rx_enable(struct net_device *);

diff --git a/trunk/drivers/staging/rtl8192e/r8192E_core.c b/trunk/drivers/staging/rtl8192e/r8192E_core.c
@@ -484,14 +484,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,7 +806,6 @@ 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;
 }
 
@@ -6538,7 +6529,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;