Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5702dea authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

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: default avatarDonald C Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent bc52f951

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -243,9 +243,7 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw) 
	u16 ext_ability = 0;

	u16 ext_ability = 0;





	if (!hw->phy.phy_semaphore_mask) {

	if (!hw->phy.phy_semaphore_mask) {

		hw->phy.lan_id = IXGBE_READ_REG(hw, IXGBE_STATUS) &

		if (hw->bus.lan_id)

				 IXGBE_STATUS_LAN_ID_1;

		if (hw->phy.lan_id)

			hw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY1_SM;

			hw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY1_SM;

		else

		else

			hw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY0_SM;

			hw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY0_SM;

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -3381,7 +3381,6 @@ struct ixgbe_phy_info { 
	bool                            sfp_setup_needed;

	bool                            sfp_setup_needed;

	u32                             revision;

	u32                             revision;

	enum ixgbe_media_type           media_type;

	enum ixgbe_media_type           media_type;

	u8				lan_id;

	u32				phy_semaphore_mask;

	u32				phy_semaphore_mask;

	bool                            reset_disable;

	bool                            reset_disable;

	ixgbe_autoneg_advertised        autoneg_advertised;

	ixgbe_autoneg_advertised        autoneg_advertised;