Remove a number of unnecessary udelay() calls.
Signed-off-by: Lennert Buytenhek <[EMAIL PROTECTED]>
diff -urN linux-2.6.15-rc1.upstream.orig/drivers/net/ixp2000/pm3386.c
linux-2.6.15-rc1.upstream/drivers/net/ixp2000/pm3386.c
--- linux-2.6.15-rc1.upstream.orig/drivers/net/ixp2000/pm3386.c 2005-11-22
12:40:19.000000000 +0100
+++ linux-2.6.15-rc1.upstream/drivers/net/ixp2000/pm3386.c 2005-11-22
12:40:27.000000000 +0100
@@ -166,9 +166,7 @@
* 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 @@
* 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 @@
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 @@
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 @@
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 @@
temp = pm3386_port_reg_read(port, 0x303, 0x100);
temp &= 0xbfff;
pm3386_port_reg_write(port, 0x303, 0x100, temp);
-
- udelay(10);
}
MODULE_LICENSE("GPL");
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
