From patchwork Mon Jan 18 15:47:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 43076 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 0C4A9B7C94 for ; Tue, 19 Jan 2010 02:47:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754007Ab0ARPrW (ORCPT ); Mon, 18 Jan 2010 10:47:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754006Ab0ARPrV (ORCPT ); Mon, 18 Jan 2010 10:47:21 -0500 Received: from mail.solarflare.com ([216.237.3.220]:25399 "EHLO exchange.solarflare.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753078Ab0ARPrU (ORCPT ); Mon, 18 Jan 2010 10:47:20 -0500 Received: from [10.17.20.50] ([10.17.20.50]) by exchange.solarflare.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Mon, 18 Jan 2010 07:48:06 -0800 Subject: [PATCH net-2.6] sfc: QT202x: Remove unreliable MMD check at initialisation From: Ben Hutchings To: David Miller Cc: netdev@vger.kernel.org, linux-net-drivers@solarflare.com Organization: Solarflare Communications Date: Mon, 18 Jan 2010 15:47:16 +0000 Message-Id: <1263829636.3667.3.camel@achroite.uk.solarflarecom.com> Mime-Version: 1.0 X-Mailer: Evolution 2.22.1 (2.22.1-2.fc9) X-OriginalArrivalTime: 18 Jan 2010 15:48:06.0389 (UTC) FILETIME=[A061DA50:01CA9855] X-TM-AS-Product-Ver: SMEX-8.0.0.1181-6.000.1038-17138.005 X-TM-AS-Result: No--13.270200-0.000000-31 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Matthew Slattery Checking the PHY XS MMD here is unnecessary and can give false negatives. Signed-off-by: Ben Hutchings --- drivers/net/sfc/qt202x_phy.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/sfc/qt202x_phy.c index ff8f0a4..e0d13a4 100644 --- a/drivers/net/sfc/qt202x_phy.c +++ b/drivers/net/sfc/qt202x_phy.c @@ -318,12 +318,6 @@ static int qt202x_reset_phy(struct efx_nic *efx) /* Wait 250ms for the PHY to complete bootup */ msleep(250); - /* Check that all the MMDs we expect are present and responding. We - * expect faults on some if the link is down, but not on the PHY XS */ - rc = efx_mdio_check_mmds(efx, QT202X_REQUIRED_DEVS, MDIO_DEVS_PHYXS); - if (rc < 0) - goto fail; - falcon_board(efx)->type->init_phy(efx); return rc;