1 files changed, 28 insertions, 29 deletions

diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
index 80a8b9888225..8a04bbd258a6 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ixgb/ixgb_hw.c
@@ -41,7 +41,7 @@ static void ixgb_mta_set(struct ixgb_hw *hw, uint32_t hash_value);
 
 static void ixgb_get_bus_info(struct ixgb_hw *hw);
 
-static boolean_t ixgb_link_reset(struct ixgb_hw *hw);
+static bool ixgb_link_reset(struct ixgb_hw *hw);
 
 static void ixgb_optics_reset(struct ixgb_hw *hw);
 
@@ -60,9 +60,9 @@ static uint16_t ixgb_read_phy_reg(struct ixgb_hw *hw,
                                   uint32_t phy_address,
                                   uint32_t device_type);
 
-static boolean_t ixgb_setup_fc(struct ixgb_hw *hw);
+static bool ixgb_setup_fc(struct ixgb_hw *hw);
 
-static boolean_t mac_addr_valid(uint8_t *mac_addr);
+static bool mac_addr_valid(uint8_t *mac_addr);
 
 static uint32_t ixgb_mac_reset(struct ixgb_hw *hw)
 {
@@ -114,7 +114,7 @@ static uint32_t ixgb_mac_reset(struct ixgb_hw *hw)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-boolean_t
+bool
 ixgb_adapter_stop(struct ixgb_hw *hw)
 {
         uint32_t ctrl_reg;
@@ -127,13 +127,13 @@ ixgb_adapter_stop(struct ixgb_hw *hw)
          */
         if(hw->adapter_stopped) {
                 DEBUGOUT("Exiting because the adapter is already stopped!!!\n");
-                return FALSE;
+                return false;
         }
 
         /* Set the Adapter Stopped flag so other driver functions stop
          * touching the Hardware.
          */
-        hw->adapter_stopped = TRUE;
+        hw->adapter_stopped = true;
 
         /* Clear interrupt mask to stop board from generating interrupts */
         DEBUGOUT("Masking off all interrupts\n");
@@ -286,15 +286,15 @@ ixgb_identify_phy(struct ixgb_hw *hw)
  * Leaves the transmit and receive units disabled and uninitialized.
  *
  * Returns:
- *      TRUE if successful,
- *      FALSE if unrecoverable problems were encountered.
+ *      true if successful,
+ *      false if unrecoverable problems were encountered.
  *****************************************************************************/
-boolean_t
+bool
 ixgb_init_hw(struct ixgb_hw *hw)
 {
         uint32_t i;
         uint32_t ctrl_reg;
-        boolean_t status;
+        bool status;
 
         DEBUGFUNC("ixgb_init_hw");
 
@@ -318,9 +318,8 @@ ixgb_init_hw(struct ixgb_hw *hw)
         /* Delay a few ms just to allow the reset to complete */
         msleep(IXGB_DELAY_AFTER_EE_RESET);
 
-        if (ixgb_get_eeprom_data(hw) == FALSE) {
-                return(FALSE);
-        }
+        if (!ixgb_get_eeprom_data(hw))
+                return false;
 
         /* Use the device id to determine the type of phy/transceiver. */
         hw->device_id = ixgb_get_ee_device_id(hw);
@@ -337,11 +336,11 @@ ixgb_init_hw(struct ixgb_hw *hw)
          */
         if (!mac_addr_valid(hw->curr_mac_addr)) {
                 DEBUGOUT("MAC address invalid after ixgb_init_rx_addrs\n");
-                return(FALSE);
+                return(false);
         }
 
         /* tell the routines in this file they can access hardware again */
-        hw->adapter_stopped = FALSE;
+        hw->adapter_stopped = false;
 
         /* Fill in the bus_info structure */
         ixgb_get_bus_info(hw);
@@ -661,12 +660,12 @@ ixgb_clear_vfta(struct ixgb_hw *hw)
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
 
-static boolean_t
+static bool
 ixgb_setup_fc(struct ixgb_hw *hw)
 {
         uint32_t ctrl_reg;
         uint32_t pap_reg = 0;   /* by default, assume no pause time */
-        boolean_t status = TRUE;
+        bool status = true;
 
         DEBUGFUNC("ixgb_setup_fc");
 
@@ -950,7 +949,7 @@ ixgb_check_for_link(struct ixgb_hw *hw)
 
         if ((xpcss_reg & IXGB_XPCSS_ALIGN_STATUS) &&
             (status_reg & IXGB_STATUS_LU)) {
-                hw->link_up = TRUE;
+                hw->link_up = true;
         } else if (!(xpcss_reg & IXGB_XPCSS_ALIGN_STATUS) &&
                    (status_reg & IXGB_STATUS_LU)) {
                 DEBUGOUT("XPCSS Not Aligned while Status:LU is set.\n");
@@ -974,10 +973,10 @@ ixgb_check_for_link(struct ixgb_hw *hw)
  *
  * Called by any function that needs to check the link status of the adapter.
  *****************************************************************************/
-boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw)
+bool ixgb_check_for_bad_link(struct ixgb_hw *hw)
 {
         uint32_t newLFC, newRFC;
-        boolean_t bad_link_returncode = FALSE;
+        bool bad_link_returncode = false;
 
         if (hw->phy_type == ixgb_phy_type_txn17401) {
                 newLFC = IXGB_READ_REG(hw, LFC);
@@ -986,7 +985,7 @@ boolean_t ixgb_check_for_bad_link(struct ixgb_hw *hw)
                     || (hw->lastRFC + 250 < newRFC)) {
                         DEBUGOUT
                             ("BAD LINK! too many LFC/RFC since last check\n");
-                        bad_link_returncode = TRUE;
+                        bad_link_returncode = true;
                 }
                 hw->lastLFC = newLFC;
                 hw->lastRFC = newRFC;
@@ -1155,21 +1154,21 @@ ixgb_get_bus_info(struct ixgb_hw *hw)
  * mac_addr - pointer to MAC address.
  *
  *****************************************************************************/
-static boolean_t
+static bool
 mac_addr_valid(uint8_t *mac_addr)
 {
-        boolean_t is_valid = TRUE;
+        bool is_valid = true;
         DEBUGFUNC("mac_addr_valid");
 
         /* Make sure it is not a multicast address */
         if (IS_MULTICAST(mac_addr)) {
                 DEBUGOUT("MAC address is multicast\n");
-                is_valid = FALSE;
+                is_valid = false;
         }
         /* Not a broadcast address */
         else if (IS_BROADCAST(mac_addr)) {
                 DEBUGOUT("MAC address is broadcast\n");
-                is_valid = FALSE;
+                is_valid = false;
         }
         /* Reject the zero address */
         else if (mac_addr[0] == 0 &&
@@ -1179,7 +1178,7 @@ mac_addr_valid(uint8_t *mac_addr)
                          mac_addr[4] == 0 &&
                          mac_addr[5] == 0) {
                 DEBUGOUT("MAC address is all zeros\n");
-                is_valid = FALSE;
+                is_valid = false;
         }
         return (is_valid);
 }
@@ -1190,10 +1189,10 @@ mac_addr_valid(uint8_t *mac_addr)
  *
  * hw - Struct containing variables accessed by shared code
  *****************************************************************************/
-static boolean_t
+static bool
 ixgb_link_reset(struct ixgb_hw *hw)
 {
-        boolean_t link_status = FALSE;
+        bool link_status = false;
         uint8_t wait_retries = MAX_RESET_ITERATIONS;
         uint8_t lrst_retries = MAX_RESET_ITERATIONS;
 
@@ -1208,7 +1207,7 @@ ixgb_link_reset(struct ixgb_hw *hw)
                         link_status =
                             ((IXGB_READ_REG(hw, STATUS) & IXGB_STATUS_LU)
                              && (IXGB_READ_REG(hw, XPCSS) &
-                                 IXGB_XPCSS_ALIGN_STATUS)) ? TRUE : FALSE;
+                                 IXGB_XPCSS_ALIGN_STATUS)) ? true : false;
                 } while (!link_status && --wait_retries);
 
         } while (!link_status && --lrst_retries);