From patchwork Mon Dec 15 08:39:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 421007 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D0BCB1400D2 for ; Mon, 15 Dec 2014 19:40:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751810AbaLOIj6 (ORCPT ); Mon, 15 Dec 2014 03:39:58 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:35929 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751769AbaLOIj5 (ORCPT ); Mon, 15 Dec 2014 03:39:57 -0500 Received: by mail-pa0-f50.google.com with SMTP id bj1so11419628pad.37 for ; Mon, 15 Dec 2014 00:39:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1xx7YSLpd1jCRxEsnFWMpPO0dU7vOsGCkL0oDKeGCf0=; b=i3NpnsIjXxWBpdDfBp7Xr5HZPsT8RyhNWSBx60lBBNgj6AXM/gY7cdPqp4U+Ez9EMf tkYytvd67rX4kk4SA0mSJEYPV3VHBdTgYSATv0UT4tkevr2fSOBKKr9q0qg/Yj/H7y4P 2z3/1SxVE71DnEbPJNyBgUqSLqAAQjc7HqKwK8H3Z8VK2V768FhJdAgqB7yTgbRUJ1pX QuHLnb7bUsthn46m0PJwW7I3wXGNzIU20CyiJwedkXqGW+fyGw/btXO2wTHGNuTTLAEm H18uY0Fo8ODKU5UNgyarpilrngUV1cGySQThrMXutQSRpWnAUhHLr6XybqgreWLsICKf 9P7g== X-Received: by 10.68.131.163 with SMTP id on3mr48887500pbb.169.1418632797350; Mon, 15 Dec 2014 00:39:57 -0800 (PST) Received: from wind-OptiPlex-780.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id wf5sm8560115pab.40.2014.12.15.00.39.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Dec 2014 00:39:56 -0800 (PST) From: Zhu Yanjun X-Google-Original-From: Zhu Yanjun To: netdev@vger.kernel.org, w@1wt.eu, zyjzyj2000@gmail.com Cc: Zhu Yanjun , Bruce Allan , Jeff Kirsher Subject: [PATCH 5/5] e1000e: cleanup use of check_reset_block function pointer Date: Mon, 15 Dec 2014 16:39:14 +0800 Message-Id: <1418632754-16698-6-git-send-email-Yanjun.Zhu@windriver.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418632754-16698-1-git-send-email-Yanjun.Zhu@windriver.com> References: <1418632754-16698-1-git-send-email-Yanjun.Zhu@windriver.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 2.6.x kernels require a similar logic change as commit 13ca85e0 [e1000e: cleanup use of check_reset_block function pointer] introduces for newer kernels. Replace e1000_check_reset_block() inline function with calls to the PHY ops check_reset_block function pointer. [yanjun.zhu: only modifications in function e1000_init_phy_params_pchlan will be backported. Others remain unchanged] Signed-off-by: Bruce Allan Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Signed-off-by: Zhu Yanjun --- drivers/net/e1000e/ich8lan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 0da2c2c..732cd48 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c @@ -280,7 +280,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) phy->ops.write_phy_reg_locked = e1000_write_phy_reg_hv_locked; phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT; - if (!e1000_check_reset_block(hw)) { + if (!hw->phy.ops.check_reset_block(hw)) { /*Set Phy Config Counter to 50msec */ ctrl = er32(FEXTNVM3); ctrl &= ~E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK;