GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-07 15:01:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

e1000e: cleanup whitespace and indentation

Browse source 
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>
This commit is contained in:
Bruce Allan 2012-02-23 03:13:18 +00:00 • committed by Jeff Kirsher
parent 06c24b915c
commit 3d3a167656
5 changed files with 38 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/ethernet/intel/e1000e/82571.c
View file

@ -1269,19 +1269,17 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
reg |= E1000_PBA_ECC_CORR_EN; reg |= E1000_PBA_ECC_CORR_EN;
ew32(PBA_ECC, reg); ew32(PBA_ECC, reg);
} }
/* /*
* Workaround for hardware errata. * Workaround for hardware errata.
* Ensure that DMA Dynamic Clock gating is disabled on 82571 and 82572 * Ensure that DMA Dynamic Clock gating is disabled on 82571 and 82572
*/ */
if ((hw->mac.type == e1000_82571) || (hw->mac.type == e1000_82572)) {
if ((hw->mac.type == e1000_82571) ||
(hw->mac.type == e1000_82572)) {
reg = er32(CTRL_EXT); reg = er32(CTRL_EXT);
reg &= ~E1000_CTRL_EXT_DMA_DYN_CLK_EN; reg &= ~E1000_CTRL_EXT_DMA_DYN_CLK_EN;
ew32(CTRL_EXT, reg); ew32(CTRL_EXT, reg);
} }
/* PCI-Ex Control Registers */ /* PCI-Ex Control Registers */
switch (hw->mac.type) { switch (hw->mac.type) {
case e1000_82574: case e1000_82574:

6
drivers/net/ethernet/intel/e1000e/ich8lan.c
View file

@ -1230,8 +1230,7 @@ s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)
u32 reg = 0; u32 reg = 0;
u16 kmrn_reg = 0; u16 kmrn_reg = 0;
ret_val = e1000e_read_kmrn_reg_locked(hw, ret_val = e1000e_read_kmrn_reg_locked(hw, E1000_KMRNCTRLSTA_K1_CONFIG,
E1000_KMRNCTRLSTA_K1_CONFIG,
&kmrn_reg); &kmrn_reg);
if (ret_val) if (ret_val)
return ret_val; return ret_val;
@ -1241,8 +1240,7 @@ s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)
else else
kmrn_reg &= ~E1000_KMRNCTRLSTA_K1_ENABLE; kmrn_reg &= ~E1000_KMRNCTRLSTA_K1_ENABLE;
ret_val = e1000e_write_kmrn_reg_locked(hw, ret_val = e1000e_write_kmrn_reg_locked(hw, E1000_KMRNCTRLSTA_K1_CONFIG,
E1000_KMRNCTRLSTA_K1_CONFIG,
kmrn_reg); kmrn_reg);
if (ret_val) if (ret_val)
return ret_val; return ret_val;

10
drivers/net/ethernet/intel/e1000e/netdev.c
View file

@ -3262,6 +3262,7 @@ static void e1000e_set_rx_mode(struct net_device *netdev)
e1000e_vlan_filter_disable(adapter); e1000e_vlan_filter_disable(adapter);
} else { } else {
int count; int count;
if (netdev->flags & IFF_ALLMULTI) { if (netdev->flags & IFF_ALLMULTI) {
rctl |= E1000_RCTL_MPE; rctl |= E1000_RCTL_MPE;
} else { } else {
@ -6103,7 +6104,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
const struct e1000_info *ei = e1000_info_tbl[ent->driver_data]; const struct e1000_info *ei = e1000_info_tbl[ent->driver_data];
resource_size_t mmio_start, mmio_len; resource_size_t mmio_start, mmio_len;
resource_size_t flash_start, flash_len; resource_size_t flash_start, flash_len;
static int cards_found; static int cards_found;
u16 aspm_disable_flag = 0; u16 aspm_disable_flag = 0;
int i, err, pci_using_dac; int i, err, pci_using_dac;
@ -6347,11 +6347,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
} 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))
e1000_read_nvm(&adapter->hw, e1000_read_nvm(&adapter->hw, NVM_INIT_CONTROL3_PORT_B,
NVM_INIT_CONTROL3_PORT_B, 1, &eeprom_data); 1, &eeprom_data);
else else
e1000_read_nvm(&adapter->hw, 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 */

47
drivers/net/ethernet/intel/e1000e/phy.c
View file

@ -1172,9 +1172,7 @@ s32 e1000e_setup_copper_link(struct e1000_hw *hw)
* Check link status. Wait up to 100 microseconds for link to become * Check link status. Wait up to 100 microseconds for link to become
* valid. * valid.
*/ */
ret_val = e1000e_phy_has_link_generic(hw, ret_val = e1000e_phy_has_link_generic(hw, COPPER_LINK_UP_LIMIT, 10,
COPPER_LINK_UP_LIMIT,
10,
&link); &link);
if (ret_val) if (ret_val)
return ret_val; return ret_val;
@ -1237,10 +1235,8 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
if (phy->autoneg_wait_to_complete) { if (phy->autoneg_wait_to_complete) {
e_dbg("Waiting for forced speed/duplex link on IGP phy.\n"); e_dbg("Waiting for forced speed/duplex link on IGP phy.\n");
ret_val = e1000e_phy_has_link_generic(hw, ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
PHY_FORCE_LIMIT, 100000, &link);
100000,
&link);
if (ret_val) if (ret_val)
return ret_val; return ret_val;
@ -1248,10 +1244,8 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
e_dbg("Link taking longer than expected.\n"); e_dbg("Link taking longer than expected.\n");
/* Try once more */ /* Try once more */
ret_val = e1000e_phy_has_link_generic(hw, ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
PHY_FORCE_LIMIT, 100000, &link);
100000,
&link);
} }
return ret_val; return ret_val;
@ -1412,10 +1406,8 @@ s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw)
if (phy->autoneg_wait_to_complete) { if (phy->autoneg_wait_to_complete) {
e_dbg("Waiting for forced speed/duplex link on IFE phy.\n"); e_dbg("Waiting for forced speed/duplex link on IFE phy.\n");
ret_val = e1000e_phy_has_link_generic(hw, ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
PHY_FORCE_LIMIT, 100000, &link);
100000,
&link);
if (ret_val) if (ret_val)
return ret_val; return ret_val;
@ -1423,10 +1415,8 @@ s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw)
e_dbg("Link taking longer than expected.\n"); e_dbg("Link taking longer than expected.\n");
/* Try once more */ /* Try once more */
ret_val = e1000e_phy_has_link_generic(hw, ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
PHY_FORCE_LIMIT, 100000, &link);
100000,
&link);
if (ret_val) if (ret_val)
return ret_val; return ret_val;
} }
@ -2167,6 +2157,7 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
s32 e1000e_get_cfg_done(struct e1000_hw *hw) s32 e1000e_get_cfg_done(struct e1000_hw *hw)
{ {
mdelay(10); mdelay(10);
return 0; return 0;
} }
@ -3155,12 +3146,10 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw)
if (ret_val) if (ret_val)
return ret_val; return ret_val;
data &= BM_CS_STATUS_LINK_UP | data &= BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
BM_CS_STATUS_RESOLVED |
BM_CS_STATUS_SPEED_MASK; BM_CS_STATUS_SPEED_MASK;
if (data != (BM_CS_STATUS_LINK_UP | if (data != (BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
BM_CS_STATUS_RESOLVED |
BM_CS_STATUS_SPEED_1000)) BM_CS_STATUS_SPEED_1000))
return 0; return 0;
@ -3227,10 +3216,8 @@ s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
if (phy->autoneg_wait_to_complete) { if (phy->autoneg_wait_to_complete) {
e_dbg("Waiting for forced speed/duplex link on 82577 phy\n"); e_dbg("Waiting for forced speed/duplex link on 82577 phy\n");
ret_val = e1000e_phy_has_link_generic(hw, ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
PHY_FORCE_LIMIT, 100000, &link);
100000,
&link);
if (ret_val) if (ret_val)
return ret_val; return ret_val;
@ -3238,10 +3225,8 @@ s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
e_dbg("Link taking longer than expected.\n"); e_dbg("Link taking longer than expected.\n");
/* Try once more */ /* Try once more */
ret_val = e1000e_phy_has_link_generic(hw, ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
PHY_FORCE_LIMIT, 100000, &link);
100000,
&link);
} }
return ret_val; return ret_val;