From 77e10b8f9eee2440757a6914e1b95c2509400390 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Wed, 23 Nov 2005 12:49:15 +0100
Subject: [PATCH] --- yaml --- r: 15764 b: refs/heads/master c:
 f48a8815f8535c62714cb596281d8480ba9e78ea h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/net/ixp2000/pm3386.c | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 3dc69f4d0955..109b33844087 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 178f171da7f0ea5cfc1c45932680c81b3a8a0bd6
+refs/heads/master: f48a8815f8535c62714cb596281d8480ba9e78ea
diff --git a/trunk/drivers/net/ixp2000/pm3386.c b/trunk/drivers/net/ixp2000/pm3386.c
index df960f1710f6..b8a59b9bedb4 100644
--- a/trunk/drivers/net/ixp2000/pm3386.c
+++ b/trunk/drivers/net/ixp2000/pm3386.c
@@ -166,9 +166,7 @@ void pm3386_init_port(int port)
 	 * Soft reset the EGMAC block.
 	 */
 	pm3386_port_reg_write(port, 0x301, 0x100, 0x8000);
-	udelay(10);
 	pm3386_port_reg_write(port, 0x301, 0x100, 0x0000);
-	udelay(10);
 
 	/*
 	 * Auto-sense autonegotiation status.
@@ -191,15 +189,12 @@ void pm3386_init_port(int port)
 	 * Set autonegotiation parameters to 'no PAUSE, full duplex.'
 	 */
 	pm3386_port_reg_write(port, 0x31c, 0x100, 0x0020);
-	udelay(10);
 
 	/*
 	 * Enable and restart autonegotiation.
 	 */
 	pm3386_port_reg_write(port, 0x318, 0x100, 0x0003);
-	udelay(1000);
 	pm3386_port_reg_write(port, 0x318, 0x100, 0x0002);
-	udelay(10);
 }
 
 void pm3386_get_mac(int port, u8 *mac)
@@ -264,8 +259,6 @@ void pm3386_enable_rx(int port)
 	temp = pm3386_port_reg_read(port, 0x303, 0x100);
 	temp |= 0x1000;
 	pm3386_port_reg_write(port, 0x303, 0x100, temp);
-
-	udelay(10);
 }
 
 void pm3386_disable_rx(int port)
@@ -275,8 +268,6 @@ void pm3386_disable_rx(int port)
 	temp = pm3386_port_reg_read(port, 0x303, 0x100);
 	temp &= 0xefff;
 	pm3386_port_reg_write(port, 0x303, 0x100, temp);
-
-	udelay(10);
 }
 
 void pm3386_enable_tx(int port)
@@ -286,8 +277,6 @@ void pm3386_enable_tx(int port)
 	temp = pm3386_port_reg_read(port, 0x303, 0x100);
 	temp |= 0x4000;
 	pm3386_port_reg_write(port, 0x303, 0x100, temp);
-
-	udelay(10);
 }
 
 void pm3386_disable_tx(int port)
@@ -297,8 +286,6 @@ void pm3386_disable_tx(int port)
 	temp = pm3386_port_reg_read(port, 0x303, 0x100);
 	temp &= 0xbfff;
 	pm3386_port_reg_write(port, 0x303, 0x100, temp);
-
-	udelay(10);
 }
 
 MODULE_LICENSE("GPL");