[dahdi-commits] mattf: linux/trunk r4426 - /linux/trunk/drivers/dahdi/wct4xxp/base.c

[SVN commits to the DAHDI project]

Author: mattf
Date: Fri Jun 20 16:14:06 2008
New Revision: 4426

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4426
Log:
Revery unnecessary udelay

Modified:
    linux/trunk/drivers/dahdi/wct4xxp/base.c

Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=4426&r1=4425&r2=4426
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Fri Jun 20 16:14:06 2008
@@ -412,14 +412,6 @@
 static inline unsigned int __t4_pci_in(struct t4 *wc, const unsigned int addr)
 {
 	unsigned int res = readl(&wc->membase[addr]);
-	if (pedanticpci) {
-		/* Even though we do not support fast back-to-back
-		 * transactions, some host bridges appear to generate them.
-		 * This delay prevents this. 
-		 */
-		if (!test_bit(T4_LOADING_FW, &wc->checkflag))
-			udelay(3);
-	}
 	return res;
 }
 
@@ -428,12 +420,6 @@
 	unsigned int tmp;
 	writel(value, &wc->membase[addr]);
 	if (pedanticpci) {
-		/* Even though we do not support fast back-to-back
-		 * transactions, some host bridges appear to generate them.
-		 * This delay prevents this. 
-		 */
-		if (!test_bit(T4_LOADING_FW, &wc->checkflag))
-			udelay(3);
 		tmp = __t4_pci_in(wc, WC_VERSION);
 		if ((tmp & 0xffff0000) != 0xc01a0000)
 			printk("TE4XXP: Version Synchronization Error!\n");
@@ -3171,15 +3157,12 @@
 		return;
 	}
 
-	set_bit(T4_LOADING_FW, &wc->checkflag);
 	if (!(wc->vpm450m = init_vpm450m(wc, laws, wc->numspans, firmware))) {
 		printk("VPM450: Failed to initialize\n");
 		if (firmware != &embedded_firmware)
 			release_firmware(firmware);
-		clear_bit(T4_LOADING_FW, &wc->checkflag);
 		return;
 	}
-	clear_bit(T4_LOADING_FW, &wc->checkflag);
 
 	if (firmware != &embedded_firmware)
 		release_firmware(firmware);