aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2012-02-07 21:55:09 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-02-13 15:28:55 -0500
commit826072555b0dceac44a6e69a0c5be137e829c9d4 (patch)
treee4dc80d15dbad51450f802ec96029a6e9ef7d572 /drivers/net/ethernet
parent7eb61d81946ccb61726600c6e8ceefcce9844f02 (diff)
e1000e: cleanup: always return 0
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>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/intel/e1000e/82571.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/ich8lan.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/mac.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/phy.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 024ac243e23f..05e9a2911168 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -796,7 +796,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
796 * otherwise, commit the checksum to the flash NVM. 796 * otherwise, commit the checksum to the flash NVM.
797 */ 797 */
798 if (hw->nvm.type != e1000_nvm_flash_hw) 798 if (hw->nvm.type != e1000_nvm_flash_hw)
799 return ret_val; 799 return 0;
800 800
801 /* Check for pending operations. */ 801 /* Check for pending operations. */
802 for (i = 0; i < E1000_FLASH_UPDATES; i++) { 802 for (i = 0; i < E1000_FLASH_UPDATES; i++) {
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 6ab7254487ad..ce348cd99d53 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1948,7 +1948,7 @@ static s32 e1000_set_d0_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
1948 u16 data; 1948 u16 data;
1949 1949
1950 if (phy->type == e1000_phy_ife) 1950 if (phy->type == e1000_phy_ife)
1951 return ret_val; 1951 return 0;
1952 1952
1953 phy_ctrl = er32(PHY_CTRL); 1953 phy_ctrl = er32(PHY_CTRL);
1954 1954
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index ce8a55a584be..b3b2f9e567ff 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -444,7 +444,7 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
444 return ret_val; 444 return ret_val;
445 445
446 if (!link) 446 if (!link)
447 return ret_val; /* No link detected */ 447 return 0; /* No link detected */
448 448
449 mac->get_link_status = false; 449 mac->get_link_status = false;
450 450
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 323cb145f849..a8b99bae0222 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -1916,7 +1916,7 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
1916 1916
1917 phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2; 1917 phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
1918 1918
1919 return ret_val; 1919 return 0;
1920} 1920}
1921 1921
1922/** 1922/**