From patchwork Tue Dec 16 23:16:29 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Fleming X-Patchwork-Id: 14359 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 6B360DDEE1 for ; Wed, 17 Dec 2008 10:17:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753069AbYLPXQr (ORCPT ); Tue, 16 Dec 2008 18:16:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752532AbYLPXQr (ORCPT ); Tue, 16 Dec 2008 18:16:47 -0500 Received: from az33egw02.freescale.net ([192.88.158.103]:39266 "EHLO az33egw02.freescale.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751392AbYLPXQq (ORCPT ); Tue, 16 Dec 2008 18:16:46 -0500 Received: from az33smr02.freescale.net (az33smr02.freescale.net [10.64.34.200]) by az33egw02.freescale.net (8.14.3/az33egw02) with ESMTP id mBGNGVSk012810 for ; Tue, 16 Dec 2008 16:16:41 -0700 (MST) Received: from ld0175-tx32.am.freescale.net (ld0175-tx32.am.freescale.net [10.82.19.125]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id mBGNGUwk019119 for ; Tue, 16 Dec 2008 17:16:30 -0600 (CST) Received: by ld0175-tx32.am.freescale.net (Postfix, from userid 12005171) id EF1EB24ED2; Tue, 16 Dec 2008 17:16:29 -0600 (CST) From: Andy Fleming To: jeff@garzik.org Cc: netdev@vger.kernel.org, Andy Fleming Subject: [PATCH] phylib: Remove unnecessary "reset" fixups in genphy_setup_forced Date: Tue, 16 Dec 2008 17:16:29 -0600 Message-Id: <1229469389-24926-1-git-send-email-afleming@freescale.com> X-Mailer: git-send-email 1.5.4.GIT Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org genphy_setup_forced hasn't actually reset the PHY for a long time, but a comment to that effect remained in the code, so code continued to act as if it *had* reset the PHY, and called the necessary fixup functions to respond to a PHY reset. With no reset, those functions are no longer needed, so we remove them. Signed-off-by: Andy Fleming --- drivers/net/phy/phy_device.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index e976c1c..b312d9c 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -508,23 +508,6 @@ int genphy_setup_forced(struct phy_device *phydev) err = phy_write(phydev, MII_BMCR, ctl); - if (err < 0) - return err; - - /* - * Run the fixups on this PHY, just in case the - * board code needs to change something after a reset - */ - err = phy_scan_fixups(phydev); - - if (err < 0) - return err; - - /* We just reset the device, so we'd better configure any - * settings the PHY requires to operate */ - if (phydev->drv->config_init) - err = phydev->drv->config_init(phydev); - return err; }