p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e1000e: Cleanup consistency in ret_val variable usage 

Fixed the file to use a consistent ret_val for return value checking.

Signed-off-by: Brian Walsh <brian@walsh.ws>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Brian Walsh 2016-04-12 23:22:30 -04:00 committed by Jeff Kirsher
parent e11f303e3d
commit 847042a6a5
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/ethernet/intel/e1000e/netdev.c
View File

@ -3368,12 +3368,12 @@ static int e1000e_write_uc_addr_list(struct net_device *netdev)
* combining * combining
*/ */
netdev_for_each_uc_addr(ha, netdev) { netdev_for_each_uc_addr(ha, netdev) {
int rval; int ret_val;
if (!rar_entries) if (!rar_entries)
break; break;
rval = hw->mac.ops.rar_set(hw, ha->addr, rar_entries--); ret_val = hw->mac.ops.rar_set(hw, ha->addr, rar_entries--);
if (rval < 0) if (ret_val < 0)
return -ENOMEM; return -ENOMEM;
count++; count++;
} }
@ -6965,7 +6965,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
int bars, i, err, pci_using_dac; int bars, i, err, pci_using_dac;
u16 eeprom_data = 0; u16 eeprom_data = 0;
u16 eeprom_apme_mask = E1000_EEPROM_APME; u16 eeprom_apme_mask = E1000_EEPROM_APME;
s32 rval = 0; s32 ret_val = 0;
if (ei->flags2 & FLAG2_DISABLE_ASPM_L0S) if (ei->flags2 & FLAG2_DISABLE_ASPM_L0S)
aspm_disable_flag = PCIE_LINK_STATE_L0S; aspm_disable_flag = PCIE_LINK_STATE_L0S;
@ -7200,18 +7200,18 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
} else if (adapter->flags & FLAG_APME_IN_CTRL3) { } else if (adapter->flags & FLAG_APME_IN_CTRL3) {
if (adapter->flags & FLAG_APME_CHECK_PORT_B && if (adapter->flags & FLAG_APME_CHECK_PORT_B &&
(adapter->hw.bus.func == 1)) (adapter->hw.bus.func == 1))
rval = e1000_read_nvm(&adapter->hw, ret_val = e1000_read_nvm(&adapter->hw,
NVM_INIT_CONTROL3_PORT_B, NVM_INIT_CONTROL3_PORT_B,
1, &eeprom_data); 1, &eeprom_data);
else else
rval = e1000_read_nvm(&adapter->hw, ret_val = e1000_read_nvm(&adapter->hw,
NVM_INIT_CONTROL3_PORT_A, NVM_INIT_CONTROL3_PORT_A,
1, &eeprom_data); 1, &eeprom_data);
} }
/* fetch WoL from EEPROM */ /* fetch WoL from EEPROM */
if (rval) if (ret_val)
e_dbg("NVM read error getting WoL initial values: %d\n", rval); e_dbg("NVM read error getting WoL initial values: %d\n", ret_val);
else if (eeprom_data & eeprom_apme_mask) else if (eeprom_data & eeprom_apme_mask)
adapter->eeprom_wol |= E1000_WUFC_MAG; adapter->eeprom_wol |= E1000_WUFC_MAG;
@ -7231,10 +7231,10 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
device_wakeup_enable(&pdev->dev); device_wakeup_enable(&pdev->dev);
/* save off EEPROM version number */ /* save off EEPROM version number */
rval = e1000_read_nvm(&adapter->hw, 5, 1, &adapter->eeprom_vers); ret_val = e1000_read_nvm(&adapter->hw, 5, 1, &adapter->eeprom_vers);
if (rval) { if (ret_val) {
e_dbg("NVM read error getting EEPROM version: %d\n", rval); e_dbg("NVM read error getting EEPROM version: %d\n", ret_val);
adapter->eeprom_vers = 0; adapter->eeprom_vers = 0;
} }