From patchwork Tue Aug 25 14:59:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 32057 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id DF664B7BC7 for ; Wed, 26 Aug 2009 01:04:58 +1000 (EST) Received: by ozlabs.org (Postfix) id CFC8EDDDD3; Wed, 26 Aug 2009 01:04:58 +1000 (EST) 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 5768BDDDA2 for ; Wed, 26 Aug 2009 01:04:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755334AbZHYPEm (ORCPT ); Tue, 25 Aug 2009 11:04:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755331AbZHYPEm (ORCPT ); Tue, 25 Aug 2009 11:04:42 -0400 Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:42605 "EHLO bob.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755329AbZHYPEm (ORCPT ); Tue, 25 Aug 2009 11:04:42 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by bob.linux.org.uk (8.14.3/8.14.3) with ESMTP id n7PExKvO016431; Tue, 25 Aug 2009 15:59:20 +0100 From: Alan Cox Subject: [PATCH 11/26] et131x: eliminate write only registry fields To: greg@kroah.com, netdev@vger.kernel.org Date: Tue, 25 Aug 2009 15:59:20 +0100 Message-ID: <20090825145918.16176.73765.stgit@localhost.localdomain> In-Reply-To: <20090825145619.16176.68780.stgit@localhost.localdomain> References: <20090825145619.16176.68780.stgit@localhost.localdomain> 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 Signed-off-by: Alan Cox --- drivers/staging/et131x/et131x_adapter.h | 4 ---- drivers/staging/et131x/et131x_config.c | 4 ---- 2 files changed, 0 insertions(+), 8 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/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h index 8e811af..a7402a3 100644 --- a/drivers/staging/et131x/et131x_adapter.h +++ b/drivers/staging/et131x/et131x_adapter.h @@ -253,8 +253,6 @@ struct et131x_adapter { /* Registry parameters */ u8 SpeedDuplex; /* speed/duplex */ eFLOW_CONTROL_t RegistryFlowControl; /* for 802.3x flow control */ - u8 RegistryWOLMatch; /* Enable WOL pattern-matching */ - u8 RegistryWOLLink; /* Link state change is independant */ u8 RegistryPhyComa; /* Phy Coma mode enable/disable */ u32 RegistryRxMemEnd; /* Size of internal rx memory */ @@ -269,9 +267,7 @@ struct et131x_adapter { u32 RegistryRxTimeInterval; /* Validation helpers */ - u8 RegistryPMWOL; u8 RegistryNMIDisable; - u32 RegistrySCGain; u8 RegistryPhyLoopbk; /* Enable Phy loopback */ /* Derived from the registry: */ diff --git a/drivers/staging/et131x/et131x_config.c b/drivers/staging/et131x/et131x_config.c index 628d6ad..f8273d1 100644 --- a/drivers/staging/et131x/et131x_config.c +++ b/drivers/staging/et131x/et131x_config.c @@ -247,8 +247,6 @@ void et131x_config_parse(struct et131x_adapter *etdev) etdev->RegistryVlanTag = PARM_VLAN_TAG_DEF; etdev->RegistryFlowControl = PARM_FLOW_CTL_DEF; - etdev->RegistryWOLLink = PARM_WOL_LINK_DEF; - etdev->RegistryWOLMatch = PARM_WOL_MATCH_DEF; etdev->RegistryJumboPacket = PARM_JUMBO_PKT_DEF; etdev->RegistryPhyComa = PARM_PHY_COMA_DEF; etdev->RegistryRxNumBuffers = PARM_RX_NUM_BUFS_DEF; @@ -257,8 +255,6 @@ void et131x_config_parse(struct et131x_adapter *etdev) etdev->RegistryTxTimeInterval = PARM_TX_TIME_INT_DEF; etdev->RegistryRxMemEnd = PARM_RX_MEM_END_DEF; etdev->RegistryMACStat = PARM_MAC_STAT_DEF; - etdev->RegistrySCGain = PARM_SC_GAIN_DEF; - etdev->RegistryPMWOL = PARM_PM_WOL_DEF; if (et131x_nmi_disable != PARM_NMI_DISABLE_DEF) etdev->RegistryNMIDisable = et131x_nmi_disable;