[zaptel-commits] mattf: branch 1.4 r4360 - /branches/1.4/kernel/wct4xxp/base.c

[SVN commits to the Zaptel project]

Author: mattf
Date: Fri Jun 20 16:10:16 2008
New Revision: 4360

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4360
Log:
Remove unnecessary udelay from read/write PCI routines

Modified:
    branches/1.4/kernel/wct4xxp/base.c

Modified: branches/1.4/kernel/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wct4xxp/base.c?view=diff&rev=4360&r1=4359&r2=4360
==============================================================================
--- branches/1.4/kernel/wct4xxp/base.c (original)
+++ branches/1.4/kernel/wct4xxp/base.c Fri Jun 20 16:10:16 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;
 }
 
@@ -432,8 +424,6 @@
 		 * 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");
@@ -3196,15 +3186,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);