Staging: et131x: eliminate write only registry fields

[safe/jmp/linux-2.6] / drivers / staging / et131x / et131x_config.c

diff --git a/drivers/staging/et131x/et131x_config.c b/drivers/staging/et131x/et131x_config.c
index 148672b..f8273d1 100644 (file)
--- a/drivers/staging/et131x/et131x_config.c
+++ b/drivers/staging/et131x/et131x_config.c
@@ -76,6 +76,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/bitops.h>
+#include <linux/pci.h>
 #include <asm/system.h>
 
 #include <linux/netdevice.h>
@@ -246,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;
@@ -256,15 +255,12 @@ 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;
        else
                etdev->RegistryNMIDisable = PARM_NMI_DISABLE_DEF;
 
-       etdev->RegistryDMACache = PARM_DMA_CACHE_DEF;
        etdev->RegistryPhyLoopbk = PARM_PHY_LOOPBK_DEF;
 
        /* Set the MAC address to a default */
@@ -288,7 +284,7 @@ void et131x_config_parse(struct et131x_adapter *etdev)
        /* If we are the 10/100 device, and gigabit is somehow requested then
         * knock it down to 100 full.
         */
-       if (etdev->DeviceID == ET131X_PCI_DEVICE_ID_FAST &&
+       if (etdev->pdev->device == ET131X_PCI_DEVICE_ID_FAST &&
            etdev->SpeedDuplex == 5)
                etdev->SpeedDuplex = 4;