From patchwork Sat Jan 10 23:05:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 17769 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 A698E474C4 for ; Sun, 11 Jan 2009 09:59:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753081AbZAJW7x (ORCPT ); Sat, 10 Jan 2009 17:59:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751441AbZAJW7w (ORCPT ); Sat, 10 Jan 2009 17:59:52 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:1187 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751163AbZAJW7v (ORCPT ); Sat, 10 Jan 2009 17:59:51 -0500 Received: from hashbaz.i.decadent.org.uk ([192.168.4.253]) by shadbolt.decadent.org.uk with esmtp (Exim 4.63) (envelope-from ) id 1LLmny-0003YG-Gm; Sat, 10 Jan 2009 22:59:47 +0000 From: Ben Hutchings To: David Miller Cc: netdev@vger.kernel.org, linux-net-drivers@solarflare.com Organization: Solarflare Communications Date: Sat, 10 Jan 2009 23:05:03 +0000 Message-Id: <1231628703.2671.3.camel@hashbaz.i.decadent.org.uk> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 X-SA-Exim-Connect-IP: 192.168.4.253 X-SA-Exim-Mail-From: bhutchings@solarflare.com X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on shadbolt.decadent.org.uk X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED,AWL autolearn=disabled version=3.2.3 Subject: [PATCH] sfc: SFT9001: Fix condition for LNPGA power-off X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Only the SFX7101 requires software power control. This was incorrectly being applied to the SFT9001 rev A as well. Signed-off-by: Ben Hutchings --- drivers/net/sfc/tenxpress.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c index b976876..9ecb77d 100644 --- a/drivers/net/sfc/tenxpress.c +++ b/drivers/net/sfc/tenxpress.c @@ -636,10 +636,11 @@ static void tenxpress_phy_fini(struct efx_nic *efx) { int reg; - if (efx->phy_type == PHY_TYPE_SFT9001B) { + if (efx->phy_type == PHY_TYPE_SFT9001B) device_remove_file(&efx->pci_dev->dev, &dev_attr_phy_short_reach); - } else { + + if (efx->phy_type == PHY_TYPE_SFX7101) { /* Power down the LNPGA */ reg = (1 << PMA_PMD_LNPGA_POWERDOWN_LBN); mdio_clause45_write(efx, efx->mii.phy_id, MDIO_MMD_PMAPMD,