netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Aaron Sierra <asierra@xes-inc.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 3/9] igb: Don't add PHY address to PCDL address
Date: Mon, 14 Dec 2015 21:38:38 -0800	[thread overview]
Message-ID: <1450157924-58901-4-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1450157924-58901-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Aaron Sierra <asierra@xes-inc.com>

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 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index c906826..8015f3b 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -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;
 
-- 
2.5.0

  parent reply	other threads:[~2015-12-15  5:38 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-15  5:38 [net-next 0/9][pull request] 1GbE Intel Wired LAN Driver Updates 2015-12-14 Jeff Kirsher
2015-12-15  5:38 ` [net-next 1/9] e1000e: Switch e1000e_up to void, drop code checking for error result Jeff Kirsher
2015-12-15  5:38 ` [net-next 2/9] igb: Remove GS40G specific defines/functions Jeff Kirsher
2015-12-15  5:38 ` Jeff Kirsher [this message]
2015-12-15  5:38 ` [net-next 4/9] igb: Improve cable length function for I210, etc Jeff Kirsher
2015-12-15  5:38 ` [net-next 5/9] igb: Explicitly label self-test result indices Jeff Kirsher
2015-12-15  5:38 ` [net-next 6/9] e1000e: Remove unreachable code Jeff Kirsher
2015-12-15  5:38 ` [net-next 7/9] e1000e: Do not read ICR in Other interrupt Jeff Kirsher
2015-12-15  5:38 ` [net-next 8/9] e1000e: Do not write lsc to ics in msi-x mode Jeff Kirsher
2015-12-15  5:38 ` [net-next 9/9] e1000e: Fix msi-x interrupt automask Jeff Kirsher
2015-12-15 16:52 ` [net-next 0/9][pull request] 1GbE Intel Wired LAN Driver Updates 2015-12-14 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1450157924-58901-4-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=asierra@xes-inc.com \
    --cc=davem@davemloft.net \
    --cc=jogreene@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).