[E1000] Read/Write register macro optimizations

* Optimized E1000_*_REG macros

[E1000] Read/Write register macro optimizations
* Optimized E1000_*_REG macros
3771495b · Jeb J. Cramer · Jeff Garzik · f4630b19 · 3771495b
Commit 3771495b authored Mar 20, 2003 by Jeb J. Cramer Committed by Jeff Garzik Mar 20, 2003
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 12 deletions

drivers/net/e1000/e1000_osdep.h drivers/net/e1000/e1000_osdep.h +10 -12

No files found.
--- a/drivers/net/e1000/e1000_osdep.h
+++ b/drivers/net/e1000/e1000_osdep.h
@@ -77,24 +77,22 @@ typedef enum {
 #define E1000_WRITE_REG(a, reg, value) ( \
-    ((a)->mac_type >= e1000_82543) ? \
+    writel((value), ((a)->hw_addr + \
-        (writel((value), ((a)->hw_addr + E1000_##reg))) : \
+        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg))))
-        (writel((value), ((a)->hw_addr + E1000_82542_##reg))))
 #define E1000_READ_REG(a, reg) ( \
-    ((a)->mac_type >= e1000_82543) ? \
+    readl((a)->hw_addr + \
-        readl((a)->hw_addr + E1000_##reg) : \
+        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg)))
-        readl((a)->hw_addr + E1000_82542_##reg))
 #define E1000_WRITE_REG_ARRAY(a, reg, offset, value) ( \
-    ((a)->mac_type >= e1000_82543) ? \
+    writel((value), ((a)->hw_addr + \
-        writel((value), ((a)->hw_addr + E1000_##reg + ((offset) << 2))) : \
+        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        writel((value), ((a)->hw_addr + E1000_82542_##reg + ((offset) << 2))))
+        ((offset) << 2))))
 #define E1000_READ_REG_ARRAY(a, reg, offset) ( \
-    ((a)->mac_type >= e1000_82543) ? \
+    readl((a)->hw_addr + \
-        readl((a)->hw_addr + E1000_##reg + ((offset) << 2)) : \
+        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        readl((a)->hw_addr + E1000_82542_##reg + ((offset) << 2)))
+        ((offset) << 2)))
 #define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, STATUS)