From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Wed, 23 Nov 2005 11:49:15 +0000 (+0100)
Subject: [PATCH] pm3386: remove unnecessary udelays
X-Git-Tag: v2.6.16-rc1~474^2~22^2~7^2~63
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f48a8815f8535c62714cb596281d8480ba9e78ea;p=linux-2.6

[PATCH] pm3386: remove unnecessary udelays

Remove a number of unnecessary udelay() calls.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/ixp2000/pm3386.c b/drivers/net/ixp2000/pm3386.c
index df960f1710..b8a59b9bed 100644
--- a/drivers/net/ixp2000/pm3386.c
+++ b/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");