Staging: et131x: eliminate write only registry fields
authorAlan Cox <alan@linux.intel.com>
Thu, 27 Aug 2009 09:59:47 +0000 (10:59 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Sep 2009 19:02:27 +0000 (12:02 -0700)
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/et131x/et131x_adapter.h
drivers/staging/et131x/et131x_config.c

index 8e811af..a7402a3 100644 (file)
@@ -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: */
index 628d6ad..f8273d1 100644 (file)
@@ -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;