e1000e: rename a few functions
Several minor cosmetic function renames. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
e9ec2c0f4b
commit
69e3fd8ccc
|
@ -248,7 +248,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static s32 e1000_get_invariants_82571(struct e1000_adapter *adapter)
|
static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)
|
||||||
{
|
{
|
||||||
struct e1000_hw *hw = &adapter->hw;
|
struct e1000_hw *hw = &adapter->hw;
|
||||||
static int global_quad_port_a; /* global port a indication */
|
static int global_quad_port_a; /* global port a indication */
|
||||||
|
@ -1337,7 +1337,7 @@ struct e1000_info e1000_82571_info = {
|
||||||
| FLAG_TARC_SPEED_MODE_BIT /* errata */
|
| FLAG_TARC_SPEED_MODE_BIT /* errata */
|
||||||
| FLAG_APME_CHECK_PORT_B,
|
| FLAG_APME_CHECK_PORT_B,
|
||||||
.pba = 38,
|
.pba = 38,
|
||||||
.get_invariants = e1000_get_invariants_82571,
|
.get_variants = e1000_get_variants_82571,
|
||||||
.mac_ops = &e82571_mac_ops,
|
.mac_ops = &e82571_mac_ops,
|
||||||
.phy_ops = &e82_phy_ops_igp,
|
.phy_ops = &e82_phy_ops_igp,
|
||||||
.nvm_ops = &e82571_nvm_ops,
|
.nvm_ops = &e82571_nvm_ops,
|
||||||
|
@ -1355,7 +1355,7 @@ struct e1000_info e1000_82572_info = {
|
||||||
| FLAG_HAS_STATS_ICR_ICT
|
| FLAG_HAS_STATS_ICR_ICT
|
||||||
| FLAG_TARC_SPEED_MODE_BIT, /* errata */
|
| FLAG_TARC_SPEED_MODE_BIT, /* errata */
|
||||||
.pba = 38,
|
.pba = 38,
|
||||||
.get_invariants = e1000_get_invariants_82571,
|
.get_variants = e1000_get_variants_82571,
|
||||||
.mac_ops = &e82571_mac_ops,
|
.mac_ops = &e82571_mac_ops,
|
||||||
.phy_ops = &e82_phy_ops_igp,
|
.phy_ops = &e82_phy_ops_igp,
|
||||||
.nvm_ops = &e82571_nvm_ops,
|
.nvm_ops = &e82571_nvm_ops,
|
||||||
|
@ -1375,7 +1375,7 @@ struct e1000_info e1000_82573_info = {
|
||||||
| FLAG_HAS_ERT
|
| FLAG_HAS_ERT
|
||||||
| FLAG_HAS_SWSM_ON_LOAD,
|
| FLAG_HAS_SWSM_ON_LOAD,
|
||||||
.pba = 20,
|
.pba = 20,
|
||||||
.get_invariants = e1000_get_invariants_82571,
|
.get_variants = e1000_get_variants_82571,
|
||||||
.mac_ops = &e82571_mac_ops,
|
.mac_ops = &e82571_mac_ops,
|
||||||
.phy_ops = &e82_phy_ops_m88,
|
.phy_ops = &e82_phy_ops_m88,
|
||||||
.nvm_ops = &e82571_nvm_ops,
|
.nvm_ops = &e82571_nvm_ops,
|
||||||
|
|
|
@ -271,7 +271,7 @@ struct e1000_info {
|
||||||
enum e1000_mac_type mac;
|
enum e1000_mac_type mac;
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
u32 pba;
|
u32 pba;
|
||||||
s32 (*get_invariants)(struct e1000_adapter *);
|
s32 (*get_variants)(struct e1000_adapter *);
|
||||||
struct e1000_mac_operations *mac_ops;
|
struct e1000_mac_operations *mac_ops;
|
||||||
struct e1000_phy_operations *phy_ops;
|
struct e1000_phy_operations *phy_ops;
|
||||||
struct e1000_nvm_operations *nvm_ops;
|
struct e1000_nvm_operations *nvm_ops;
|
||||||
|
@ -357,7 +357,7 @@ extern struct e1000_info e1000_ich8_info;
|
||||||
extern struct e1000_info e1000_ich9_info;
|
extern struct e1000_info e1000_ich9_info;
|
||||||
extern struct e1000_info e1000_es2_info;
|
extern struct e1000_info e1000_es2_info;
|
||||||
|
|
||||||
extern s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num);
|
extern s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num);
|
||||||
|
|
||||||
extern s32 e1000e_commit_phy(struct e1000_hw *hw);
|
extern s32 e1000e_commit_phy(struct e1000_hw *hw);
|
||||||
|
|
||||||
|
|
|
@ -238,7 +238,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static s32 e1000_get_invariants_80003es2lan(struct e1000_adapter *adapter)
|
static s32 e1000_get_variants_80003es2lan(struct e1000_adapter *adapter)
|
||||||
{
|
{
|
||||||
struct e1000_hw *hw = &adapter->hw;
|
struct e1000_hw *hw = &adapter->hw;
|
||||||
s32 rc;
|
s32 rc;
|
||||||
|
@ -1243,7 +1243,7 @@ struct e1000_info e1000_es2_info = {
|
||||||
| FLAG_DISABLE_FC_PAUSE_TIME /* errata */
|
| FLAG_DISABLE_FC_PAUSE_TIME /* errata */
|
||||||
| FLAG_TIPG_MEDIUM_FOR_80003ESLAN,
|
| FLAG_TIPG_MEDIUM_FOR_80003ESLAN,
|
||||||
.pba = 38,
|
.pba = 38,
|
||||||
.get_invariants = e1000_get_invariants_80003es2lan,
|
.get_variants = e1000_get_variants_80003es2lan,
|
||||||
.mac_ops = &es2_mac_ops,
|
.mac_ops = &es2_mac_ops,
|
||||||
.phy_ops = &es2_phy_ops,
|
.phy_ops = &es2_phy_ops,
|
||||||
.nvm_ops = &es2_nvm_ops,
|
.nvm_ops = &es2_nvm_ops,
|
||||||
|
|
|
@ -316,7 +316,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static s32 e1000_get_invariants_ich8lan(struct e1000_adapter *adapter)
|
static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
|
||||||
{
|
{
|
||||||
struct e1000_hw *hw = &adapter->hw;
|
struct e1000_hw *hw = &adapter->hw;
|
||||||
s32 rc;
|
s32 rc;
|
||||||
|
@ -2253,7 +2253,7 @@ struct e1000_info e1000_ich8_info = {
|
||||||
| FLAG_HAS_FLASH
|
| FLAG_HAS_FLASH
|
||||||
| FLAG_APME_IN_WUC,
|
| FLAG_APME_IN_WUC,
|
||||||
.pba = 8,
|
.pba = 8,
|
||||||
.get_invariants = e1000_get_invariants_ich8lan,
|
.get_variants = e1000_get_variants_ich8lan,
|
||||||
.mac_ops = &ich8_mac_ops,
|
.mac_ops = &ich8_mac_ops,
|
||||||
.phy_ops = &ich8_phy_ops,
|
.phy_ops = &ich8_phy_ops,
|
||||||
.nvm_ops = &ich8_nvm_ops,
|
.nvm_ops = &ich8_nvm_ops,
|
||||||
|
@ -2270,7 +2270,7 @@ struct e1000_info e1000_ich9_info = {
|
||||||
| FLAG_HAS_FLASH
|
| FLAG_HAS_FLASH
|
||||||
| FLAG_APME_IN_WUC,
|
| FLAG_APME_IN_WUC,
|
||||||
.pba = 10,
|
.pba = 10,
|
||||||
.get_invariants = e1000_get_invariants_ich8lan,
|
.get_variants = e1000_get_variants_ich8lan,
|
||||||
.mac_ops = &ich8_mac_ops,
|
.mac_ops = &ich8_mac_ops,
|
||||||
.phy_ops = &ich8_phy_ops,
|
.phy_ops = &ich8_phy_ops,
|
||||||
.nvm_ops = &ich8_nvm_ops,
|
.nvm_ops = &ich8_nvm_ops,
|
||||||
|
|
|
@ -2477,7 +2477,7 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
|
||||||
return ret_val;
|
return ret_val;
|
||||||
}
|
}
|
||||||
|
|
||||||
s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num)
|
s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num)
|
||||||
{
|
{
|
||||||
s32 ret_val;
|
s32 ret_val;
|
||||||
u16 nvm_data;
|
u16 nvm_data;
|
||||||
|
@ -2487,14 +2487,14 @@ s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num)
|
||||||
hw_dbg(hw, "NVM Read Error\n");
|
hw_dbg(hw, "NVM Read Error\n");
|
||||||
return ret_val;
|
return ret_val;
|
||||||
}
|
}
|
||||||
*part_num = (u32)(nvm_data << 16);
|
*pba_num = (u32)(nvm_data << 16);
|
||||||
|
|
||||||
ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_1, 1, &nvm_data);
|
ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_1, 1, &nvm_data);
|
||||||
if (ret_val) {
|
if (ret_val) {
|
||||||
hw_dbg(hw, "NVM Read Error\n");
|
hw_dbg(hw, "NVM Read Error\n");
|
||||||
return ret_val;
|
return ret_val;
|
||||||
}
|
}
|
||||||
*part_num |= nvm_data;
|
*pba_num |= nvm_data;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3824,7 +3824,7 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
|
||||||
{
|
{
|
||||||
struct e1000_hw *hw = &adapter->hw;
|
struct e1000_hw *hw = &adapter->hw;
|
||||||
struct net_device *netdev = adapter->netdev;
|
struct net_device *netdev = adapter->netdev;
|
||||||
u32 part_num;
|
u32 pba_num;
|
||||||
|
|
||||||
/* print bus type/speed/width info */
|
/* print bus type/speed/width info */
|
||||||
ndev_info(netdev, "(PCI Express:2.5GB/s:%s) "
|
ndev_info(netdev, "(PCI Express:2.5GB/s:%s) "
|
||||||
|
@ -3839,10 +3839,10 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
|
||||||
ndev_info(netdev, "Intel(R) PRO/%s Network Connection\n",
|
ndev_info(netdev, "Intel(R) PRO/%s Network Connection\n",
|
||||||
(hw->phy.type == e1000_phy_ife)
|
(hw->phy.type == e1000_phy_ife)
|
||||||
? "10/100" : "1000");
|
? "10/100" : "1000");
|
||||||
e1000e_read_part_num(hw, &part_num);
|
e1000e_read_pba_num(hw, &pba_num);
|
||||||
ndev_info(netdev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
|
ndev_info(netdev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
|
||||||
hw->mac.type, hw->phy.type,
|
hw->mac.type, hw->phy.type,
|
||||||
(part_num >> 8), (part_num & 0xff));
|
(pba_num >> 8), (pba_num & 0xff));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -3974,7 +3974,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
|
||||||
memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
|
memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
|
||||||
memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
|
memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
|
||||||
|
|
||||||
err = ei->get_invariants(adapter);
|
err = ei->get_variants(adapter);
|
||||||
if (err)
|
if (err)
|
||||||
goto err_hw_init;
|
goto err_hw_init;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue