e1000, ixgb: Remove pointless wrappers

Signed-off-by: Jeff Garzik <jeff@garzik.org>

2 files changed, 3 insertions, 15 deletions

diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
index 2b1515574faf..acc6df7a6b38 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ixgb/ixgb_hw.c
@@ -83,7 +83,7 @@ static uint32_t ixgb_mac_reset(struct ixgb_hw *hw)
 #endif
 
         /* Delay a few ms just to allow the reset to complete */
-        msec_delay(IXGB_DELAY_AFTER_RESET);
+        msleep(IXGB_DELAY_AFTER_RESET);
         ctrl_reg = IXGB_READ_REG(hw, CTRL0);
 #ifdef DBG
         /* Make sure the self-clearing global reset bit did self clear */
@@ -133,7 +133,7 @@ ixgb_adapter_stop(struct ixgb_hw *hw)
          */
         IXGB_WRITE_REG(hw, RCTL, IXGB_READ_REG(hw, RCTL) & ~IXGB_RCTL_RXEN);
         IXGB_WRITE_REG(hw, TCTL, IXGB_READ_REG(hw, TCTL) & ~IXGB_TCTL_TXEN);
-        msec_delay(IXGB_DELAY_BEFORE_RESET);
+        msleep(IXGB_DELAY_BEFORE_RESET);
 
         /* Issue a global reset to the MAC.  This will reset the chip's
          * transmit, receive, DMA, and link units.  It will not effect
@@ -300,7 +300,7 @@ ixgb_init_hw(struct ixgb_hw *hw)
 #endif
 
         /* Delay a few ms just to allow the reset to complete */
-        msec_delay(IXGB_DELAY_AFTER_EE_RESET);
+        msleep(IXGB_DELAY_AFTER_EE_RESET);
 
         if (ixgb_get_eeprom_data(hw) == FALSE) {
                 return(FALSE);
diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h
index ee982feac64d..19cb1d586dec 100644
--- a/drivers/net/ixgb/ixgb_osdep.h
+++ b/drivers/net/ixgb/ixgb_osdep.h
@@ -40,18 +40,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)
-#endif
-
-#define PCI_COMMAND_REGISTER   PCI_COMMAND
-#define CMD_MEM_WRT_INVALIDATE PCI_COMMAND_INVALIDATE
-
 typedef enum {
 #undef FALSE
         FALSE = 0,