git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
e1000: Remove spaces after casts and function names
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
e1000
/
e1000_osdep.h
diff --git
a/drivers/net/e1000/e1000_osdep.h
b/drivers/net/e1000/e1000_osdep.h
index 18afc0c25dac5d42b2c0c366f2f7ab22f8d54153..d9298522f5aeef3f5f84baefc3f0f3961b21a1c0 100644
(file)
--- a/
drivers/net/e1000/e1000_osdep.h
+++ b/
drivers/net/e1000/e1000_osdep.h
@@
-41,15
+41,6
@@
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
-typedef enum {
-#undef FALSE
- FALSE = 0,
-#undef TRUE
- TRUE = 1
-} boolean_t;
-
-#define MSGOUT(S, A, B) printk(KERN_DEBUG S "\n", A, B)
-
#ifdef DBG
#define DEBUGOUT(S) printk(KERN_DEBUG S "\n")
#define DEBUGOUT1(S, A...) printk(KERN_DEBUG S "\n", A)
#ifdef DBG
#define DEBUGOUT(S) printk(KERN_DEBUG S "\n")
#define DEBUGOUT1(S, A...) printk(KERN_DEBUG S "\n", A)
@@
-58,19
+49,19
@@
typedef enum {
#define DEBUGOUT1(S, A...)
#endif
#define DEBUGOUT1(S, A...)
#endif
-#define DEBUGFUNC(F) DEBUGOUT(F)
+#define DEBUGFUNC(F) DEBUGOUT(F
"\n"
)
#define DEBUGOUT2 DEBUGOUT1
#define DEBUGOUT3 DEBUGOUT2
#define DEBUGOUT7 DEBUGOUT3
#define DEBUGOUT2 DEBUGOUT1
#define DEBUGOUT3 DEBUGOUT2
#define DEBUGOUT7 DEBUGOUT3
-#define
E1000_WRITE_REG(a, reg, value) (
\
-
writel((value), ((a)->hw_addr +
\
-
(((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg)
)))
+#define
er32(reg)
\
+
(readl(hw->hw_addr + ((hw->mac_type >= e1000_82543)
\
+
? E1000_##reg : E1000_82542_##reg
)))
-#define
E1000_READ_REG(a, reg) (
\
-
readl((a)->hw_addr +
\
-
(((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg
)))
+#define
ew32(reg, value)
\
+
(writel((value), (hw->hw_addr + ((hw->mac_type >= e1000_82543)
\
+
? E1000_##reg : E1000_82542_##reg)
)))
#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) ( \
writel((value), ((a)->hw_addr + \
#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) ( \
writel((value), ((a)->hw_addr + \
@@
-105,7
+96,7
@@
typedef enum {
(((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
(offset)))
(((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
(offset)))
-#define E1000_WRITE_FLUSH(
a) E1000_READ_REG(a,
STATUS)
+#define E1000_WRITE_FLUSH(
) er32(
STATUS)
#define E1000_WRITE_ICH_FLASH_REG(a, reg, value) ( \
writel((value), ((a)->flash_address + reg)))
#define E1000_WRITE_ICH_FLASH_REG(a, reg, value) ( \
writel((value), ((a)->flash_address + reg)))