From patchwork Tue Nov 3 18:37:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Sierra X-Patchwork-Id: 540135 X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 36E281413DB for ; Thu, 5 Nov 2015 05:59:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 85121939A5; Wed, 4 Nov 2015 18:59:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Kk8Ed8WbPvRM; Wed, 4 Nov 2015 18:59:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4E88A9396E; Wed, 4 Nov 2015 18:59:26 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 23E5C1C15DE for ; Tue, 3 Nov 2015 19:34:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1F61F84317 for ; Tue, 3 Nov 2015 19:34:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EjLHbjYVUDMC for ; Tue, 3 Nov 2015 19:34:23 +0000 (UTC) X-Greylist: delayed 00:57:11 by SQLgrey-1.7.6 Received: from xes-mad.com (xes-mad.com [216.165.139.218]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9D631841A0 for ; Tue, 3 Nov 2015 19:34:23 +0000 (UTC) Received: from zimbra.xes-mad.com (zimbra.xes-mad.com [10.52.0.127]) by xes-mad.com (8.13.8/8.13.8) with ESMTP id tA3IbJCG028489; Tue, 3 Nov 2015 12:37:19 -0600 Date: Tue, 3 Nov 2015 12:37:18 -0600 (CST) From: Aaron Sierra To: Jeff Kirsher , intel-wired-lan@lists.osuosl.org Message-ID: <1064069608.305775.1446575838742.JavaMail.zimbra@xes-inc.com> In-Reply-To: <197584129.304313.1446575155971.JavaMail.zimbra@xes-inc.com> MIME-Version: 1.0 X-Originating-IP: [10.52.16.65] X-Mailer: Zimbra 8.0.6_GA_5922 (ZimbraWebClient - FF40 (Linux)/8.0.6_GA_5922) Thread-Topic: Don't add PHY address to PCDL address Thread-Index: UFb7Wia29HfE9p6n5tv+UpK/qY4ExQ== X-Mailman-Approved-At: Wed, 04 Nov 2015 18:59:25 +0000 Cc: Joe Schultz Subject: [Intel-wired-lan] [PATCH 2/5] igb: Don't add PHY address to PCDL address X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" There is no reason to add the PHY address into the PCDL register address. Signed-off-by: Aaron Sierra Tested-by: Aaron Brown --- 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 ec1aea5..407d44a 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;