Commit 9e2d7657 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: cleanup - check return values consistently



The majority of the e1000e code checks most function return values using a
test like 'if (ret_val)' or 'if (!ret_val)' but there are a few instances
of 'if (ret_val == 0)'.  This patch converts the latter to the former for
consistency.
Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f36bb6ca
...@@ -537,7 +537,7 @@ static int e1000_set_eeprom(struct net_device *netdev, ...@@ -537,7 +537,7 @@ static int e1000_set_eeprom(struct net_device *netdev,
ret_val = e1000_read_nvm(hw, first_word, 1, &eeprom_buff[0]); ret_val = e1000_read_nvm(hw, first_word, 1, &eeprom_buff[0]);
ptr++; ptr++;
} }
if (((eeprom->offset + eeprom->len) & 1) && (ret_val == 0)) if (((eeprom->offset + eeprom->len) & 1) && (!ret_val))
/* need read/modify/write of last changed EEPROM word */ /* need read/modify/write of last changed EEPROM word */
/* only the first byte of the word is being modified */ /* only the first byte of the word is being modified */
ret_val = e1000_read_nvm(hw, last_word, 1, ret_val = e1000_read_nvm(hw, last_word, 1,
......
...@@ -2286,7 +2286,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw) ...@@ -2286,7 +2286,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
} }
udelay(1); udelay(1);
} }
if (ret_val == 0) { if (!ret_val) {
/* /*
* Successful in waiting for previous cycle to timeout, * Successful in waiting for previous cycle to timeout,
* now set the Flash Cycle Done. * now set the Flash Cycle Done.
...@@ -2404,7 +2404,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset, ...@@ -2404,7 +2404,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
udelay(1); udelay(1);
/* Steps */ /* Steps */
ret_val = e1000_flash_cycle_init_ich8lan(hw); ret_val = e1000_flash_cycle_init_ich8lan(hw);
if (ret_val != 0) if (ret_val)
break; break;
hsflctl.regval = er16flash(ICH_FLASH_HSFCTL); hsflctl.regval = er16flash(ICH_FLASH_HSFCTL);
...@@ -2424,7 +2424,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset, ...@@ -2424,7 +2424,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
* read in (shift in) the Flash Data0, the order is * read in (shift in) the Flash Data0, the order is
* least significant byte first msb to lsb * least significant byte first msb to lsb
*/ */
if (ret_val == 0) { if (!ret_val) {
flash_data = er32flash(ICH_FLASH_FDATA0); flash_data = er32flash(ICH_FLASH_FDATA0);
if (size == 1) if (size == 1)
*data = (u8)(flash_data & 0x000000FF); *data = (u8)(flash_data & 0x000000FF);
...@@ -2936,7 +2936,7 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank) ...@@ -2936,7 +2936,7 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
ret_val = e1000_flash_cycle_ich8lan(hw, ret_val = e1000_flash_cycle_ich8lan(hw,
ICH_FLASH_ERASE_COMMAND_TIMEOUT); ICH_FLASH_ERASE_COMMAND_TIMEOUT);
if (ret_val == 0) if (!ret_val)
break; break;
/* /*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment