diff options
| author | Don Skidmore | 2015-06-19 18:23:36 +0200 |
|---|---|---|
| committer | Jeff Kirsher | 2015-09-02 02:03:36 +0200 |
| commit | d5702dea43fc517c389f2d9825213dabbfdaed5e (patch) | |
| tree | abbf81a7c10636c5b15658d53e655917221bead3 /drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | |
| parent | ixgbe: use kzalloc for allocating one thing (diff) | |
| download | kernel-qcow2-linux-d5702dea43fc517c389f2d9825213dabbfdaed5e.tar.gz kernel-qcow2-linux-d5702dea43fc517c389f2d9825213dabbfdaed5e.tar.xz kernel-qcow2-linux-d5702dea43fc517c389f2d9825213dabbfdaed5e.zip | |
ixgbe: Remove second instance of lan_id variable
This patch removes the redundant lan_id in the phy struct and uses
the bus version. Both variables exist and intend to represent the
STATUS register LAN_ID field. However, phy.lan_id is not bit shifted
so the phy.lan_id = 0x0 for LAN Id 0 and phy.lan_id = 0x4 for LAN Id 1.
Where bus.lan_id is bit shifted so bus.lan_id = 0x0 for LAN Id 0 and
bus.lan_id = 0x1 for LAN Id 1. There seems no need for the additional
lan_id variable and this should make the code less confusing.
Signed-off-by: Donald C Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index 526a20bf7488..740e566cca07 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c @@ -243,9 +243,7 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw) u16 ext_ability = 0; if (!hw->phy.phy_semaphore_mask) { - hw->phy.lan_id = IXGBE_READ_REG(hw, IXGBE_STATUS) & - IXGBE_STATUS_LAN_ID_1; - if (hw->phy.lan_id) + if (hw->bus.lan_id) hw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY1_SM; else hw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY0_SM; |