Skip to content

Commit

Permalink
e1000e: cleanup: always return 0
Browse files Browse the repository at this point in the history
These are a few instances of returning a value that can only be 0 so just
use a 'return 0' to make it more obvious.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Bruce Allan authored and Jeff Kirsher committed Feb 13, 2012
1 parent 7eb61d8 commit 8260725
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/intel/e1000e/82571.c
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
* otherwise, commit the checksum to the flash NVM.
*/
if (hw->nvm.type != e1000_nvm_flash_hw)
return ret_val;
return 0;

/* Check for pending operations. */
for (i = 0; i < E1000_FLASH_UPDATES; i++) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/intel/e1000e/ich8lan.c
Original file line number Diff line number Diff line change
Expand Up @@ -1948,7 +1948,7 @@ static s32 e1000_set_d0_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
u16 data;

if (phy->type == e1000_phy_ife)
return ret_val;
return 0;

phy_ctrl = er32(PHY_CTRL);

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/intel/e1000e/mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
return ret_val;

if (!link)
return ret_val; /* No link detected */
return 0; /* No link detected */

mac->get_link_status = false;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/intel/e1000e/phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -1916,7 +1916,7 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)

phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;

return ret_val;
return 0;
}

/**
Expand Down

0 comments on commit 8260725

Please sign in to comment.