ixgbe: Remove second instance of lan_id variable
Subsystems (2)
PATCH 1/1 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.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 4 +--- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +1 -3
@@ -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 ;
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +0 -1
@@ -3381,7 +3381,6 @@ struct ixgbe_phy_info {bool sfp_setup_needed;u32 revision;enum ixgbe_media_type media_type; -u8 lan_id;u32 phy_semaphore_mask;bool reset_disable;ixgbe_autoneg_advertised autoneg_advertised;
Singh
PATCH 1/1 ixgbe: Remove second instance of lan_id variable
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Donald C Skidmore
Sent: Friday, June 19, 2015 9:24 AM
To: [email protected]
Subject: [Intel-wired-lan] [net-next PATCH] 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.
---