Skip to content

L
linux
Commit 55c5f55e authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files
Options

e1000e: cleanup some whitespace and indentation issues 

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 c063f606
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 48 deletions
drivers/net/ethernet/intel/e1000e/80003es2lan.c
View file @ 55c5f55e
...@@ -1438,18 +1438,18 @@ static const struct e1000_phy_operations es2_phy_ops = { ...@@ -1438,18 +1438,18 @@ static const struct e1000_phy_operations es2_phy_ops = {
.acquire = e1000_acquire_phy_80003es2lan, .acquire = e1000_acquire_phy_80003es2lan,
.check_polarity = e1000_check_polarity_m88, .check_polarity = e1000_check_polarity_m88,
.check_reset_block = e1000e_check_reset_block_generic, .check_reset_block = e1000e_check_reset_block_generic,
.commit = e1000e_phy_sw_reset, .commit = e1000e_phy_sw_reset,
.force_speed_duplex = e1000_phy_force_speed_duplex_80003es2lan, .force_speed_duplex = e1000_phy_force_speed_duplex_80003es2lan,
.get_cfg_done = e1000_get_cfg_done_80003es2lan, .get_cfg_done = e1000_get_cfg_done_80003es2lan,
.get_cable_length = e1000_get_cable_length_80003es2lan, .get_cable_length = e1000_get_cable_length_80003es2lan,
.get_info = e1000e_get_phy_info_m88, .get_info = e1000e_get_phy_info_m88,
.read_reg = e1000_read_phy_reg_gg82563_80003es2lan, .read_reg = e1000_read_phy_reg_gg82563_80003es2lan,
.release = e1000_release_phy_80003es2lan, .release = e1000_release_phy_80003es2lan,
.reset = e1000e_phy_hw_reset_generic, .reset = e1000e_phy_hw_reset_generic,
.set_d0_lplu_state = NULL, .set_d0_lplu_state = NULL,
.set_d3_lplu_state = e1000e_set_d3_lplu_state, .set_d3_lplu_state = e1000e_set_d3_lplu_state,
.write_reg = e1000_write_phy_reg_gg82563_80003es2lan, .write_reg = e1000_write_phy_reg_gg82563_80003es2lan,
.cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan, .cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan,
}; };
static const struct e1000_nvm_operations es2_nvm_ops = { static const struct e1000_nvm_operations es2_nvm_ops = {
......
drivers/net/ethernet/intel/e1000e/82571.c
View file @ 55c5f55e
...@@ -1327,9 +1327,10 @@ static void e1000_clear_vfta_82571(struct e1000_hw *hw) ...@@ -1327,9 +1327,10 @@ static void e1000_clear_vfta_82571(struct e1000_hw *hw)
*/ */
vfta_offset = (hw->mng_cookie.vlan_id >> vfta_offset = (hw->mng_cookie.vlan_id >>
E1000_VFTA_ENTRY_SHIFT) & E1000_VFTA_ENTRY_SHIFT) &
E1000_VFTA_ENTRY_MASK; E1000_VFTA_ENTRY_MASK;
vfta_bit_in_reg = 1 << (hw->mng_cookie.vlan_id & vfta_bit_in_reg =
E1000_VFTA_ENTRY_BIT_SHIFT_MASK); 1 << (hw->mng_cookie.vlan_id &
E1000_VFTA_ENTRY_BIT_SHIFT_MASK);
} }
break; break;
default: default:
...@@ -1931,7 +1932,7 @@ static const struct e1000_phy_operations e82_phy_ops_igp = { ...@@ -1931,7 +1932,7 @@ static const struct e1000_phy_operations e82_phy_ops_igp = {
.set_d0_lplu_state = e1000_set_d0_lplu_state_82571, .set_d0_lplu_state = e1000_set_d0_lplu_state_82571,
.set_d3_lplu_state = e1000e_set_d3_lplu_state, .set_d3_lplu_state = e1000e_set_d3_lplu_state,
.write_reg = e1000e_write_phy_reg_igp, .write_reg = e1000e_write_phy_reg_igp,
.cfg_on_link_up = NULL, .cfg_on_link_up = NULL,
}; };
static const struct e1000_phy_operations e82_phy_ops_m88 = { static const struct e1000_phy_operations e82_phy_ops_m88 = {
...@@ -1949,7 +1950,7 @@ static const struct e1000_phy_operations e82_phy_ops_m88 = { ...@@ -1949,7 +1950,7 @@ static const struct e1000_phy_operations e82_phy_ops_m88 = {
.set_d0_lplu_state = e1000_set_d0_lplu_state_82571, .set_d0_lplu_state = e1000_set_d0_lplu_state_82571,
.set_d3_lplu_state = e1000e_set_d3_lplu_state, .set_d3_lplu_state = e1000e_set_d3_lplu_state,
.write_reg = e1000e_write_phy_reg_m88, .write_reg = e1000e_write_phy_reg_m88,
.cfg_on_link_up = NULL, .cfg_on_link_up = NULL,
}; };
static const struct e1000_phy_operations e82_phy_ops_bm = { static const struct e1000_phy_operations e82_phy_ops_bm = {
...@@ -1967,7 +1968,7 @@ static const struct e1000_phy_operations e82_phy_ops_bm = { ...@@ -1967,7 +1968,7 @@ static const struct e1000_phy_operations e82_phy_ops_bm = {
.set_d0_lplu_state = e1000_set_d0_lplu_state_82571, .set_d0_lplu_state = e1000_set_d0_lplu_state_82571,
.set_d3_lplu_state = e1000e_set_d3_lplu_state, .set_d3_lplu_state = e1000e_set_d3_lplu_state,
.write_reg = e1000e_write_phy_reg_bm2, .write_reg = e1000e_write_phy_reg_bm2,
.cfg_on_link_up = NULL, .cfg_on_link_up = NULL,
}; };
static const struct e1000_nvm_operations e82571_nvm_ops = { static const struct e1000_nvm_operations e82571_nvm_ops = {
......
drivers/net/ethernet/intel/e1000e/defines.h
View file @ 55c5f55e
...@@ -96,19 +96,19 @@ ...@@ -96,19 +96,19 @@
/* mask to determine if packets should be dropped due to frame errors */ /* mask to determine if packets should be dropped due to frame errors */
#define E1000_RXD_ERR_FRAME_ERR_MASK ( \ #define E1000_RXD_ERR_FRAME_ERR_MASK ( \
E1000_RXD_ERR_CE | \ E1000_RXD_ERR_CE | \
E1000_RXD_ERR_SE | \ E1000_RXD_ERR_SE | \
E1000_RXD_ERR_SEQ | \ E1000_RXD_ERR_SEQ | \
E1000_RXD_ERR_CXE | \ E1000_RXD_ERR_CXE | \
E1000_RXD_ERR_RXE) E1000_RXD_ERR_RXE)
/* Same mask, but for extended and packet split descriptors */ /* Same mask, but for extended and packet split descriptors */
#define E1000_RXDEXT_ERR_FRAME_ERR_MASK ( \ #define E1000_RXDEXT_ERR_FRAME_ERR_MASK ( \
E1000_RXDEXT_STATERR_CE | \ E1000_RXDEXT_STATERR_CE | \
E1000_RXDEXT_STATERR_SE | \ E1000_RXDEXT_STATERR_SE | \
E1000_RXDEXT_STATERR_SEQ | \ E1000_RXDEXT_STATERR_SEQ | \
E1000_RXDEXT_STATERR_CXE | \ E1000_RXDEXT_STATERR_CXE | \
E1000_RXDEXT_STATERR_RXE) E1000_RXDEXT_STATERR_RXE)
#define E1000_MRQC_RSS_FIELD_MASK 0xFFFF0000 #define E1000_MRQC_RSS_FIELD_MASK 0xFFFF0000
#define E1000_MRQC_RSS_FIELD_IPV4_TCP 0x00010000 #define E1000_MRQC_RSS_FIELD_IPV4_TCP 0x00010000
...@@ -253,14 +253,15 @@ ...@@ -253,14 +253,15 @@
#define ADVERTISE_1000_FULL 0x0020 #define ADVERTISE_1000_FULL 0x0020
/* 1000/H is not supported, nor spec-compliant. */ /* 1000/H is not supported, nor spec-compliant. */
#define E1000_ALL_SPEED_DUPLEX ( ADVERTISE_10_HALF | ADVERTISE_10_FULL | \ #define E1000_ALL_SPEED_DUPLEX ( \
ADVERTISE_100_HALF | ADVERTISE_100_FULL | \ ADVERTISE_10_HALF | ADVERTISE_10_FULL | ADVERTISE_100_HALF | \
ADVERTISE_1000_FULL) ADVERTISE_100_FULL | ADVERTISE_1000_FULL)
#define E1000_ALL_NOT_GIG ( ADVERTISE_10_HALF | ADVERTISE_10_FULL | \ #define E1000_ALL_NOT_GIG ( \
ADVERTISE_100_HALF | ADVERTISE_100_FULL) ADVERTISE_10_HALF | ADVERTISE_10_FULL | ADVERTISE_100_HALF | \
#define E1000_ALL_100_SPEED (ADVERTISE_100_HALF | ADVERTISE_100_FULL) ADVERTISE_100_FULL)
#define E1000_ALL_10_SPEED (ADVERTISE_10_HALF | ADVERTISE_10_FULL) #define E1000_ALL_100_SPEED (ADVERTISE_100_HALF | ADVERTISE_100_FULL)
#define E1000_ALL_HALF_DUPLEX (ADVERTISE_10_HALF | ADVERTISE_100_HALF) #define E1000_ALL_10_SPEED (ADVERTISE_10_HALF | ADVERTISE_10_FULL)
#define E1000_ALL_HALF_DUPLEX (ADVERTISE_10_HALF | ADVERTISE_100_HALF)
#define AUTONEG_ADVERTISE_SPEED_DEFAULT E1000_ALL_SPEED_DUPLEX #define AUTONEG_ADVERTISE_SPEED_DEFAULT E1000_ALL_SPEED_DUPLEX
...@@ -422,11 +423,11 @@ ...@@ -422,11 +423,11 @@
* o LSC = Link Status Change * o LSC = Link Status Change
*/ */
#define IMS_ENABLE_MASK ( \ #define IMS_ENABLE_MASK ( \
E1000_IMS_RXT0 | \ E1000_IMS_RXT0 | \
E1000_IMS_TXDW | \ E1000_IMS_TXDW | \
E1000_IMS_RXDMT0 | \ E1000_IMS_RXDMT0 | \
E1000_IMS_RXSEQ | \ E1000_IMS_RXSEQ | \
E1000_IMS_LSC) E1000_IMS_LSC)
/* Interrupt Mask Set */ /* Interrupt Mask Set */
#define E1000_IMS_TXDW E1000_ICR_TXDW /* Transmit desc written back */ #define E1000_IMS_TXDW E1000_ICR_TXDW /* Transmit desc written back */
......
drivers/net/ethernet/intel/e1000e/ich8lan.c
View file @ 55c5f55e
...@@ -4507,7 +4507,7 @@ static const struct e1000_mac_operations ich8_mac_ops = { ...@@ -4507,7 +4507,7 @@ static const struct e1000_mac_operations ich8_mac_ops = {
.reset_hw = e1000_reset_hw_ich8lan, .reset_hw = e1000_reset_hw_ich8lan,
.init_hw = e1000_init_hw_ich8lan, .init_hw = e1000_init_hw_ich8lan,
.setup_link = e1000_setup_link_ich8lan, .setup_link = e1000_setup_link_ich8lan,
.setup_physical_interface= e1000_setup_copper_link_ich8lan, .setup_physical_interface = e1000_setup_copper_link_ich8lan,
/* id_led_init dependent on mac type */ /* id_led_init dependent on mac type */
.config_collision_dist = e1000e_config_collision_dist_generic, .config_collision_dist = e1000e_config_collision_dist_generic,
.rar_set = e1000e_rar_set_generic, .rar_set = e1000e_rar_set_generic,
...@@ -4529,7 +4529,7 @@ static const struct e1000_phy_operations ich8_phy_ops = { ...@@ -4529,7 +4529,7 @@ static const struct e1000_phy_operations ich8_phy_ops = {
static const struct e1000_nvm_operations ich8_nvm_ops = { static const struct e1000_nvm_operations ich8_nvm_ops = {
.acquire = e1000_acquire_nvm_ich8lan, .acquire = e1000_acquire_nvm_ich8lan,
.read = e1000_read_nvm_ich8lan, .read = e1000_read_nvm_ich8lan,
.release = e1000_release_nvm_ich8lan, .release = e1000_release_nvm_ich8lan,
.reload = e1000e_reload_nvm_generic, .reload = e1000e_reload_nvm_generic,
.update = e1000_update_nvm_checksum_ich8lan, .update = e1000_update_nvm_checksum_ich8lan,
......
drivers/net/ethernet/intel/e1000e/mac.c
View file @ 55c5f55e
...@@ -1074,8 +1074,8 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw) ...@@ -1074,8 +1074,8 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
ret_val = e1e_rphy(hw, PHY_AUTONEG_ADV, &mii_nway_adv_reg); ret_val = e1e_rphy(hw, PHY_AUTONEG_ADV, &mii_nway_adv_reg);
if (ret_val) if (ret_val)
return ret_val; return ret_val;
ret_val = ret_val = e1e_rphy(hw, PHY_LP_ABILITY,
e1e_rphy(hw, PHY_LP_ABILITY, &mii_nway_lp_ability_reg); &mii_nway_lp_ability_reg);
if (ret_val) if (ret_val)
return ret_val; return ret_val;
......
drivers/net/ethernet/intel/e1000e/netdev.c
View file @ 55c5f55e
...@@ -6571,8 +6571,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -6571,8 +6571,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
err = pci_request_selected_regions_exclusive(pdev, err = pci_request_selected_regions_exclusive(pdev,
pci_select_bars(pdev, IORESOURCE_MEM), pci_select_bars(pdev, IORESOURCE_MEM),
e1000e_driver_name); e1000e_driver_name);
if (err) if (err)
goto err_pci_reg; goto err_pci_reg;
......
drivers/net/ethernet/intel/e1000e/param.c
View file @ 55c5f55e
...@@ -53,8 +53,7 @@ MODULE_PARM_DESC(copybreak, ...@@ -53,8 +53,7 @@ MODULE_PARM_DESC(copybreak,
*/ */
#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET } #define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
#define E1000_PARAM(X, desc) \ #define E1000_PARAM(X, desc) \
static int X[E1000_MAX_NIC+1] \ static int X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
= E1000_PARAM_INIT; \
static unsigned int num_##X; \ static unsigned int num_##X; \
module_param_array_named(X, X, int, &num_##X, 0); \ module_param_array_named(X, X, int, &num_##X, 0); \
MODULE_PARM_DESC(X, desc); MODULE_PARM_DESC(X, desc);
......
Markdown is supported
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7