diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-19 15:27:07 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-19 15:27:07 -0400 |
commit | f8ec473387f70d103c83ffb3ab50cb2b1380d0c0 (patch) | |
tree | 8abcae6e3e7c4692519196c26dac4a82e65753b4 /drivers/net/e1000/e1000_osdep.h | |
parent | 23b6b0e3e8306ce3d00e0c87196bfaad335b9096 (diff) |
e1000, ixgb: Remove pointless wrappers
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/e1000/e1000_osdep.h')
-rw-r--r-- | drivers/net/e1000/e1000_osdep.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h index 2d3e8b06cab0..46bc49df15e7 100644 --- a/drivers/net/e1000/e1000_osdep.h +++ b/drivers/net/e1000/e1000_osdep.h | |||
@@ -42,25 +42,6 @@ | |||
42 | #include <linux/interrupt.h> | 42 | #include <linux/interrupt.h> |
43 | #include <linux/sched.h> | 43 | #include <linux/sched.h> |
44 | 44 | ||
45 | #ifndef msec_delay | ||
46 | #define msec_delay(x) do { if(in_interrupt()) { \ | ||
47 | /* Don't mdelay in interrupt context! */ \ | ||
48 | BUG(); \ | ||
49 | } else { \ | ||
50 | msleep(x); \ | ||
51 | } } while (0) | ||
52 | |||
53 | /* Some workarounds require millisecond delays and are run during interrupt | ||
54 | * context. Most notably, when establishing link, the phy may need tweaking | ||
55 | * but cannot process phy register reads/writes faster than millisecond | ||
56 | * intervals...and we establish link due to a "link status change" interrupt. | ||
57 | */ | ||
58 | #define msec_delay_irq(x) mdelay(x) | ||
59 | #endif | ||
60 | |||
61 | #define PCI_COMMAND_REGISTER PCI_COMMAND | ||
62 | #define CMD_MEM_WRT_INVALIDATE PCI_COMMAND_INVALIDATE | ||
63 | |||
64 | typedef enum { | 45 | typedef enum { |
65 | #undef FALSE | 46 | #undef FALSE |
66 | FALSE = 0, | 47 | FALSE = 0, |