e1000e: set bools to true/false instead of 1/0

Set booleans to 'true' or 'false' to make it clear it is a boolean.  Also
change instances of TRUE/FALSE in comments to lowercase true/false.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 0e8aa3441b977755ed85d2b7be2f7e718f93f674..468dd7d4fcad6b29acb2b4511b749a4353e29a9c 100644 (file)
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -230,7 +230,8 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
        /* Set rar entry count */
        mac->rar_entry_count = E1000_RAR_ENTRIES;
        /* Set if manageability features are enabled. */
-       mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK) ? 1 : 0;
+       mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK)
+                       ? true : false;
 
        /* check for link */
        switch (hw->phy.media_type) {
@@ -753,7 +754,7 @@ static s32 e1000_get_cfg_done_82571(struct e1000_hw *hw)
 /**
  *  e1000_set_d0_lplu_state_82571 - Set Low Power Linkup D0 state
  *  @hw: pointer to the HW structure
- *  @active: TRUE to enable LPLU, FALSE to disable
+ *  @active: true to enable LPLU, false to disable
  *
  *  Sets the LPLU D0 state according to the active flag.  When activating LPLU
  *  this function also disables smart speed and vice versa.  LPLU will not be
@@ -1521,7 +1522,7 @@ static s32 e1000_valid_led_default_82571(struct e1000_hw *hw, u16 *data)
 bool e1000e_get_laa_state_82571(struct e1000_hw *hw)
 {
        if (hw->mac.type != e1000_82571)
-               return 0;
+               return false;
 
        return hw->dev_spec.e82571.laa_is_present;
 }

diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index 2d1415610d7719fc93b7071f919e966812581263..795d433e656ffbf6d69a8a26d29a5ff62e4bfa53 100644 (file)
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -213,7 +213,8 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
        /* Set rar entry count */
        mac->rar_entry_count = E1000_RAR_ENTRIES;
        /* Set if manageability features are enabled. */
-       mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK) ? 1 : 0;
+       mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK)
+                        ? true : false;
 
        /* check for link */
        switch (hw->phy.media_type) {

diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 191a4e39d2899d5c16535dabfc5d46f4db650583..f8ee0f29d237767de28d52cbeeac25ac74779853 100644 (file)
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -401,7 +401,7 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
 
        /* Clear shadow ram */
        for (i = 0; i < nvm->word_size; i++) {
-               dev_spec->shadow_ram[i].modified = 0;
+               dev_spec->shadow_ram[i].modified = false;
                dev_spec->shadow_ram[i].value    = 0xFFFF;
        }
 
@@ -430,7 +430,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
        if (mac->type == e1000_ich8lan)
                mac->rar_entry_count--;
        /* Set if manageability features are enabled. */
-       mac->arc_subsystem_valid = 1;
+       mac->arc_subsystem_valid = true;
 
        /* LED operations */
        switch (mac->type) {
@@ -464,7 +464,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
 
        /* Enable PCS Lock-loss workaround for ICH8 */
        if (mac->type == e1000_ich8lan)
-               e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw, 1);
+               e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw, true);
 
        return 0;
 }
@@ -1403,7 +1403,7 @@ out:
 /**
  *  e1000_set_d0_lplu_state_ich8lan - Set Low Power Linkup D0 state
  *  @hw: pointer to the HW structure
- *  @active: TRUE to enable LPLU, FALSE to disable
+ *  @active: true to enable LPLU, false to disable
  *
  *  Sets the LPLU D0 state according to the active flag.  When
  *  activating LPLU this function also disables smart speed
@@ -1489,7 +1489,7 @@ static s32 e1000_set_d0_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
 /**
  *  e1000_set_d3_lplu_state_ich8lan - Set Low Power Linkup D3 state
  *  @hw: pointer to the HW structure
- *  @active: TRUE to enable LPLU, FALSE to disable
+ *  @active: true to enable LPLU, false to disable
  *
  *  Sets the LPLU D3 state according to the active flag.  When
  *  activating LPLU this function also disables smart speed
@@ -1952,7 +1952,7 @@ static s32 e1000_write_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
        nvm->ops.acquire(hw);
 
        for (i = 0; i < words; i++) {
-               dev_spec->shadow_ram[offset+i].modified = 1;
+               dev_spec->shadow_ram[offset+i].modified = true;
                dev_spec->shadow_ram[offset+i].value = data[i];
        }
 
@@ -2111,7 +2111,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 
        /* Great!  Everything worked, we can now clear the cached entries. */
        for (i = 0; i < E1000_ICH8_SHADOW_RAM_WORDS; i++) {
-               dev_spec->shadow_ram[i].modified = 0;
+               dev_spec->shadow_ram[i].modified = false;
                dev_spec->shadow_ram[i].value = 0xFFFF;
        }
 
@@ -3083,8 +3083,8 @@ static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw)
  *  @hw: pointer to the HW structure
  *  @state: boolean value used to set the current Kumeran workaround state
  *
- *  If ICH8, set the current Kumeran workaround state (enabled - TRUE
- *  /disabled - FALSE).
+ *  If ICH8, set the current Kumeran workaround state (enabled - true
+ *  /disabled - false).
  **/
 void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
                                                 bool state)

diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 0c6ad0e671755ce649a9aaa950ab3e3e7198a1fe..d173bf88cc94bd3a33ec3947386b15b17529695c 100644 (file)
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -371,7 +371,7 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
        if (!link)
                return ret_val; /* No link detected */
 
-       mac->get_link_status = 0;
+       mac->get_link_status = false;
 
        /*
         * Check if there was DownShift, must be checked
@@ -1603,7 +1603,7 @@ void e1000e_reset_adaptive(struct e1000_hw *hw)
        mac->ifs_step_size = IFS_STEP;
        mac->ifs_ratio = IFS_RATIO;
 
-       mac->in_ifs_mode = 0;
+       mac->in_ifs_mode = false;
        ew32(AIT, 0);
 }
 
@@ -1620,7 +1620,7 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
 
        if ((mac->collision_delta * mac->ifs_ratio) > mac->tx_packet_delta) {
                if (mac->tx_packet_delta > MIN_NUM_XMITS) {
-                       mac->in_ifs_mode = 1;
+                       mac->in_ifs_mode = true;
                        if (mac->current_ifs_val < mac->ifs_max_val) {
                                if (!mac->current_ifs_val)
                                        mac->current_ifs_val = mac->ifs_min_val;
@@ -1634,7 +1634,7 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
                if (mac->in_ifs_mode &&
                    (mac->tx_packet_delta <= MIN_NUM_XMITS)) {
                        mac->current_ifs_val = 0;
-                       mac->in_ifs_mode = 0;
+                       mac->in_ifs_mode = false;
                        ew32(AIT, 0);
                }
        }
@@ -2277,7 +2277,7 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
 
        /* No manageability, no filtering */
        if (!e1000e_check_mng_mode(hw)) {
-               hw->mac.tx_pkt_filtering = 0;
+               hw->mac.tx_pkt_filtering = false;
                return 0;
        }
 
@@ -2287,7 +2287,7 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
         */
        ret_val = e1000_mng_enable_host_if(hw);
        if (ret_val != 0) {
-               hw->mac.tx_pkt_filtering = 0;
+               hw->mac.tx_pkt_filtering = false;
                return ret_val;
        }
 
@@ -2306,17 +2306,17 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
         * take the safe route of assuming Tx filtering is enabled.
         */
        if ((hdr_csum != csum) || (hdr->signature != E1000_IAMT_SIGNATURE)) {
-               hw->mac.tx_pkt_filtering = 1;
+               hw->mac.tx_pkt_filtering = true;
                return 1;
        }
 
        /* Cookie area is valid, make the final check for filtering. */
        if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING)) {
-               hw->mac.tx_pkt_filtering = 0;
+               hw->mac.tx_pkt_filtering = false;
                return 0;
        }
 
-       hw->mac.tx_pkt_filtering = 1;
+       hw->mac.tx_pkt_filtering = true;
        return 1;
 }
 
@@ -2473,7 +2473,7 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
 {
        u32 manc;
        u32 fwsm, factps;
-       bool ret_val = 0;
+       bool ret_val = false;
 
        manc = er32(MANC);
 
@@ -2488,13 +2488,13 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
                if (!(factps & E1000_FACTPS_MNGCG) &&
                    ((fwsm & E1000_FWSM_MODE_MASK) ==
                     (e1000_mng_mode_pt << E1000_FWSM_MODE_SHIFT))) {
-                       ret_val = 1;
+                       ret_val = true;
                        return ret_val;
                }
        } else {
                if ((manc & E1000_MANC_SMBUS_EN) &&
                    !(manc & E1000_MANC_ASF_EN)) {
-                       ret_val = 1;
+                       ret_val = true;
                        return ret_val;
                }
        }

diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index 440f366b73f656a00f03d6191c60ff16b68e9d43..99d53fae430792050316035e791def2c8987a953 100644 (file)
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -834,7 +834,7 @@ s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw)
        msleep(100);
 
        /* disable lplu d0 during driver init */
-       ret_val = e1000_set_d0_lplu_state(hw, 0);
+       ret_val = e1000_set_d0_lplu_state(hw, false);
        if (ret_val) {
                e_dbg("Error Disabling LPLU D0\n");
                return ret_val;
@@ -1545,7 +1545,7 @@ s32 e1000e_check_downshift(struct e1000_hw *hw)
                break;
        default:
                /* speed downshift not supported */
-               phy->speed_downgraded = 0;
+               phy->speed_downgraded = false;
                return 0;
        }
 
@@ -1907,7 +1907,7 @@ s32 e1000e_get_phy_info_igp(struct e1000_hw *hw)
                return -E1000_ERR_CONFIG;
        }
 
-       phy->polarity_correction = 1;
+       phy->polarity_correction = true;
 
        ret_val = e1000_check_polarity_igp(hw);
        if (ret_val)