ixgbe: Use MDIO_PRTAD_NONE consistently

The value MDIO_PRTAD_NONE should be used to indicate no PHY address.
Not 0, not 0xFFFF. Use the MDIO_PRTAD_NONE value consistently.

Signed-off-by: Mark Rustad <[email protected]>
Tested-by: Andrew Bowers <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index db0731e05401e4f9290478297a5b9b709419110e..021ab9b89c71e30cd8262118e051ab9aaf672ec4 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -346,8 +346,8 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw)
                                return 0;
                        }
                }
-               /* clear value if nothing found */
-               hw->phy.mdio.prtad = 0;
+               /* indicate no PHY found */
+               hw->phy.mdio.prtad = MDIO_PRTAD_NONE;
                return IXGBE_ERR_PHY_ADDR_INVALID;
        }
        return 0;

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index cd22efb940ad4f9bd08f3a14a9ab44e8e533773f..7e6b9267ca9da3b4562c150a0e1aac35f8df92be 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -1459,7 +1459,7 @@ ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw, ixgbe_link_speed speed,
        /* Configure internal PHY for KR/KX. */
        ixgbe_setup_kr_speed_x550em(hw, speed);
 
-       if (!hw->phy.mdio.prtad || hw->phy.mdio.prtad == 0xFFFF)
+       if (hw->phy.mdio.prtad == MDIO_PRTAD_NONE)
                return IXGBE_ERR_PHY_ADDR_INVALID;
 
        /* Get external PHY device id */