From patchwork Fri Nov 21 18:59:22 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 10081 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 59750DDDEA for ; Sat, 22 Nov 2008 05:59:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752999AbYKUS7q (ORCPT ); Fri, 21 Nov 2008 13:59:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752746AbYKUS7q (ORCPT ); Fri, 21 Nov 2008 13:59:46 -0500 Received: from qmta03.emeryville.ca.mail.comcast.net ([76.96.30.32]:34726 "EHLO QMTA03.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752115AbYKUS7q (ORCPT ); Fri, 21 Nov 2008 13:59:46 -0500 Received: from OMTA01.emeryville.ca.mail.comcast.net ([76.96.30.11]) by QMTA03.emeryville.ca.mail.comcast.net with comcast id hr6f1a00C0EPchoA3uzgEg; Fri, 21 Nov 2008 18:59:40 +0000 Received: from gitlost.lost ([63.64.152.142]) by OMTA01.emeryville.ca.mail.comcast.net with comcast id huzN1a00634bfcX8MuzQKT; Fri, 21 Nov 2008 18:59:36 +0000 X-Authority-Analysis: v=1.0 c=1 a=CYvnYAGu0Z0A:10 a=h4FX6ahcPPsA:10 a=sVJGRK_ciGCr5lduu3YA:9 a=BjnzcpeFw7mrXVqz5ie3HFcQuNoA:4 a=dGJ0OcVc7YAA:10 a=iYlkOlhu7C0A:10 From: Jeff Kirsher Subject: [NET-NEXT PATCH 02/14] e1000e: commit speed/duplex changes for m88 PHY To: davem@davemloft.net Cc: netdev@vger.kernel.org, jeff@garzik.org, Bruce Allan , Jeff Kirsher Date: Fri, 21 Nov 2008 10:59:22 -0800 Message-ID: <20081121185922.32313.24916.stgit@gitlost.lost> In-Reply-To: <20081121185859.32313.42332.stgit@gitlost.lost> References: <20081121185859.32313.42332.stgit@gitlost.lost> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Bruce Allan Follow the convention used elsewhere in e1000e to 'commit' PHY changes instead of directly writing to the PHY CTRL register to reset it. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher --- drivers/net/e1000e/phy.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c index 6cd333a..cb7d71e 100644 --- a/drivers/net/e1000e/phy.c +++ b/drivers/net/e1000e/phy.c @@ -1030,14 +1030,14 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw) e1000e_phy_force_speed_duplex_setup(hw, &phy_data); - /* Reset the phy to commit changes. */ - phy_data |= MII_CR_RESET; - ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data); if (ret_val) return ret_val; - udelay(1); + /* Reset the phy to commit changes. */ + ret_val = e1000e_commit_phy(hw); + if (ret_val) + return ret_val; if (phy->autoneg_wait_to_complete) { hw_dbg(hw, "Waiting for forced speed/duplex link on M88 phy.\n");