igb: Don't add PHY address to PCDL address
authorAaron Sierra <asierra@xes-inc.com>
Tue, 3 Nov 2015 18:37:18 +0000 (12:37 -0600)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 14 Dec 2015 23:58:59 +0000 (15:58 -0800)
There is no reason to add the PHY address into the PCDL register address.

Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/igb/e1000_phy.c

index c906826b6c02bd10fe80610580660dd0e871e936..8015f3b8e579319f3a86e1189890f88ab4564088 100644 (file)
@@ -1734,8 +1734,7 @@ s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw)
                        goto out;
 
                /* Get cable length from PHY Cable Diagnostics Control Reg */
-               ret_val = phy->ops.read_reg(hw, (I347AT4_PCDL + phy->addr),
-                                           &phy_data);
+               ret_val = phy->ops.read_reg(hw, I347AT4_PCDL, &phy_data);
                if (ret_val)
                        goto out;