1 files changed, 37 insertions, 37 deletions

diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c
index 8e9302fc8865..2f7ed52c7502 100644
--- a/drivers/net/ixgb/ixgb_ee.c
+++ b/drivers/net/ixgb/ixgb_ee.c
@@ -29,11 +29,11 @@
 #include "ixgb_hw.h"
 #include "ixgb_ee.h"
 /* Local prototypes */
-static uint16_t ixgb_shift_in_bits(struct ixgb_hw *hw);
+static u16 ixgb_shift_in_bits(struct ixgb_hw *hw);
 
 static void ixgb_shift_out_bits(struct ixgb_hw *hw,
-                                uint16_t data,
-                                uint16_t count);
+                                u16 data,
+                                u16 count);
 static void ixgb_standby_eeprom(struct ixgb_hw *hw);
 
 static bool ixgb_wait_eeprom_command(struct ixgb_hw *hw);
@@ -48,7 +48,7 @@ static void ixgb_cleanup_eeprom(struct ixgb_hw *hw);
  *****************************************************************************/
 static void
 ixgb_raise_clock(struct ixgb_hw *hw,
-                  uint32_t *eecd_reg)
+                  u32 *eecd_reg)
 {
         /* Raise the clock input to the EEPROM (by setting the SK bit), and then
          *  wait 50 microseconds.
@@ -67,7 +67,7 @@ ixgb_raise_clock(struct ixgb_hw *hw,
  *****************************************************************************/
 static void
 ixgb_lower_clock(struct ixgb_hw *hw,
-                  uint32_t *eecd_reg)
+                  u32 *eecd_reg)
 {
         /* Lower the clock input to the EEPROM (by clearing the SK bit), and then
          * wait 50 microseconds.
@@ -87,11 +87,11 @@ ixgb_lower_clock(struct ixgb_hw *hw,
  *****************************************************************************/
 static void
 ixgb_shift_out_bits(struct ixgb_hw *hw,
-                                         uint16_t data,
-                                         uint16_t count)
+                                         u16 data,
+                                         u16 count)
 {
-        uint32_t eecd_reg;
-        uint32_t mask;
+        u32 eecd_reg;
+        u32 mask;
 
         /* We need to shift "count" bits out to the EEPROM. So, value in the
          * "data" parameter will be shifted out to the EEPROM one bit at a time.
@@ -133,12 +133,12 @@ ixgb_shift_out_bits(struct ixgb_hw *hw,
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-static uint16_t
+static u16
 ixgb_shift_in_bits(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
-        uint32_t i;
-        uint16_t data;
+        u32 eecd_reg;
+        u32 i;
+        u16 data;
 
         /* In order to read a register from the EEPROM, we need to shift 16 bits
          * in from the EEPROM. Bits are "shifted in" by raising the clock input to
@@ -179,7 +179,7 @@ ixgb_shift_in_bits(struct ixgb_hw *hw)
 static void
 ixgb_setup_eeprom(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
+        u32 eecd_reg;
 
         eecd_reg = IXGB_READ_REG(hw, EECD);
 
@@ -201,7 +201,7 @@ ixgb_setup_eeprom(struct ixgb_hw *hw)
 static void
 ixgb_standby_eeprom(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
+        u32 eecd_reg;
 
         eecd_reg = IXGB_READ_REG(hw, EECD);
 
@@ -235,7 +235,7 @@ ixgb_standby_eeprom(struct ixgb_hw *hw)
 static void
 ixgb_clock_eeprom(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
+        u32 eecd_reg;
 
         eecd_reg = IXGB_READ_REG(hw, EECD);
 
@@ -259,7 +259,7 @@ ixgb_clock_eeprom(struct ixgb_hw *hw)
 static void
 ixgb_cleanup_eeprom(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
+        u32 eecd_reg;
 
         eecd_reg = IXGB_READ_REG(hw, EECD);
 
@@ -285,8 +285,8 @@ ixgb_cleanup_eeprom(struct ixgb_hw *hw)
 static bool
 ixgb_wait_eeprom_command(struct ixgb_hw *hw)
 {
-        uint32_t eecd_reg;
-        uint32_t i;
+        u32 eecd_reg;
+        u32 i;
 
         /* Toggle the CS line.  This in effect tells to EEPROM to actually execute
          * the command in question.
@@ -325,13 +325,13 @@ ixgb_wait_eeprom_command(struct ixgb_hw *hw)
 bool
 ixgb_validate_eeprom_checksum(struct ixgb_hw *hw)
 {
-        uint16_t checksum = 0;
-        uint16_t i;
+        u16 checksum = 0;
+        u16 i;
 
         for(i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++)
                 checksum += ixgb_read_eeprom(hw, i);
 
-        if(checksum == (uint16_t) EEPROM_SUM)
+        if(checksum == (u16) EEPROM_SUM)
                 return (true);
         else
                 return (false);
@@ -348,13 +348,13 @@ ixgb_validate_eeprom_checksum(struct ixgb_hw *hw)
 void
 ixgb_update_eeprom_checksum(struct ixgb_hw *hw)
 {
-        uint16_t checksum = 0;
-        uint16_t i;
+        u16 checksum = 0;
+        u16 i;
 
         for(i = 0; i < EEPROM_CHECKSUM_REG; i++)
                 checksum += ixgb_read_eeprom(hw, i);
 
-        checksum = (uint16_t) EEPROM_SUM - checksum;
+        checksum = (u16) EEPROM_SUM - checksum;
 
         ixgb_write_eeprom(hw, EEPROM_CHECKSUM_REG, checksum);
         return;
@@ -372,7 +372,7 @@ ixgb_update_eeprom_checksum(struct ixgb_hw *hw)
  *
  *****************************************************************************/
 void
-ixgb_write_eeprom(struct ixgb_hw *hw, uint16_t offset, uint16_t data)
+ixgb_write_eeprom(struct ixgb_hw *hw, u16 offset, u16 data)
 {
         struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
@@ -425,11 +425,11 @@ ixgb_write_eeprom(struct ixgb_hw *hw, uint16_t offset, uint16_t data)
  * Returns:
  *  The 16-bit value read from the eeprom
  *****************************************************************************/
-uint16_t
+u16
 ixgb_read_eeprom(struct ixgb_hw *hw,
-                  uint16_t offset)
+                  u16 offset)
 {
-        uint16_t data;
+        u16 data;
 
         /*  Prepare the EEPROM for reading  */
         ixgb_setup_eeprom(hw);
@@ -463,8 +463,8 @@ ixgb_read_eeprom(struct ixgb_hw *hw,
 bool
 ixgb_get_eeprom_data(struct ixgb_hw *hw)
 {
-        uint16_t i;
-        uint16_t checksum = 0;
+        u16 i;
+        u16 checksum = 0;
         struct ixgb_ee_map_type *ee_map;
 
         DEBUGFUNC("ixgb_get_eeprom_data");
@@ -473,13 +473,13 @@ ixgb_get_eeprom_data(struct ixgb_hw *hw)
 
         DEBUGOUT("ixgb_ee: Reading eeprom data\n");
         for(i = 0; i < IXGB_EEPROM_SIZE ; i++) {
-                uint16_t ee_data;
+                u16 ee_data;
                 ee_data = ixgb_read_eeprom(hw, i);
                 checksum += ee_data;
                 hw->eeprom[i] = cpu_to_le16(ee_data);
         }
 
-        if (checksum != (uint16_t) EEPROM_SUM) {
+        if (checksum != (u16) EEPROM_SUM) {
                 DEBUGOUT("ixgb_ee: Checksum invalid.\n");
                 /* clear the init_ctrl_reg_1 to signify that the cache is
                  * invalidated */
@@ -529,7 +529,7 @@ ixgb_check_and_get_eeprom_data (struct ixgb_hw* hw)
  *          Word at indexed offset in eeprom, if valid, 0 otherwise.
  ******************************************************************************/
 __le16
-ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index)
+ixgb_get_eeprom_word(struct ixgb_hw *hw, u16 index)
 {
 
         if ((index < IXGB_EEPROM_SIZE) &&
@@ -550,7 +550,7 @@ ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index)
  ******************************************************************************/
 void
 ixgb_get_ee_mac_addr(struct ixgb_hw *hw,
-                        uint8_t *mac_addr)
+                        u8 *mac_addr)
 {
         int i;
         struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
@@ -574,7 +574,7 @@ ixgb_get_ee_mac_addr(struct ixgb_hw *hw,
  * Returns:
  *          PBA number if EEPROM contents are valid, 0 otherwise
  ******************************************************************************/
-uint32_t
+u32
 ixgb_get_ee_pba_number(struct ixgb_hw *hw)
 {
         if (ixgb_check_and_get_eeprom_data(hw) == true)
@@ -593,7 +593,7 @@ ixgb_get_ee_pba_number(struct ixgb_hw *hw)
  * Returns:
  *          Device Id if EEPROM contents are valid, 0 otherwise
  ******************************************************************************/
-uint16_t
+u16
 ixgb_get_ee_device_id(struct ixgb_hw *hw)
 {
         struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;