summaryrefslogtreecommitdiff
path: root/drivers/net/e1000/e1000_osdep.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-19 15:27:07 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-19 15:27:07 -0400
commitf8ec473387f70d103c83ffb3ab50cb2b1380d0c0 (patch)
tree8abcae6e3e7c4692519196c26dac4a82e65753b4 /drivers/net/e1000/e1000_osdep.h
parent23b6b0e3e8306ce3d00e0c87196bfaad335b9096 (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.h19
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 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
-#ifndef msec_delay
-#define msec_delay(x) do { if(in_interrupt()) { \
- /* Don't mdelay in interrupt context! */ \
- BUG(); \
- } else { \
- msleep(x); \
- } } while (0)
-
-/* Some workarounds require millisecond delays and are run during interrupt
- * context. Most notably, when establishing link, the phy may need tweaking
- * but cannot process phy register reads/writes faster than millisecond
- * intervals...and we establish link due to a "link status change" interrupt.
- */
-#define msec_delay_irq(x) mdelay(x)
-#endif
-
-#define PCI_COMMAND_REGISTER PCI_COMMAND
-#define CMD_MEM_WRT_INVALIDATE PCI_COMMAND_INVALIDATE
-
typedef enum {
#undef FALSE
FALSE = 0,