Staging: et131x: kill copied PCI fields

They are all in the pcidev anyway plus are not used by the code

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/et131x/et1310_eeprom.c b/drivers/staging/et131x/et1310_eeprom.c
index 9a6dbd60f772756a200a34e495eee35f87380545..29d1c0ef5c31cd86f91a587c16b07883b0393edd 100644 (file)
--- a/drivers/staging/et131x/et1310_eeprom.c
+++ b/drivers/staging/et131x/et1310_eeprom.c
@@ -292,7 +292,7 @@ int32_t EepromWriteByte(struct et131x_adapter *etdev, uint32_t unAddress,
                 *         so we do a blind write for load bug.
                 */
                if (bStatus & LBCIF_STATUS_GENERAL_ERROR
-                   && etdev->RevisionID == 0) {
+                   && etdev->pdev->revision == 0) {
                        break;
                }
 

diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c
index d9c7a4486b417eb9680af04b3d8610a639f22447..63a23b9e94a10e8b15dfe66ed394ce619c7431e2 100644 (file)
--- a/drivers/staging/et131x/et1310_phy.c
+++ b/drivers/staging/et131x/et1310_phy.c
@@ -841,7 +841,7 @@ void TPAL_SetPhyAutoNeg(struct et131x_adapter *etdev)
 
        ET1310_PhyAdvertise100BaseT(etdev, TRUEPHY_ADV_DUPLEX_BOTH);
 
-       if (etdev->DeviceID != ET131X_PCI_DEVICE_ID_FAST)
+       if (etdev->pdev->device != ET131X_PCI_DEVICE_ID_FAST)
                ET1310_PhyAdvertise1000BaseT(etdev, TRUEPHY_ADV_DUPLEX_FULL);
        else
                ET1310_PhyAdvertise1000BaseT(etdev, TRUEPHY_ADV_DUPLEX_NONE);

diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
index df4a625b43ce6b1ae99ed9d7c922397bd06f75f7..69509d71cfc11f09ecf982350fcb1354bcb78d18 100644 (file)
--- a/drivers/staging/et131x/et131x_adapter.h
+++ b/drivers/staging/et131x/et131x_adapter.h
@@ -250,19 +250,6 @@ struct et131x_adapter {
        /* Pointer to the device's PCI register space */
        ADDRESS_MAP_t __iomem *CSRAddress;
 
-       /* PCI config space info, for debug purposes only. */
-       u8 RevisionID;
-       u16 VendorID;
-       u16 DeviceID;
-       u16 SubVendorID;
-       u16 SubSystemID;
-       u32 CacheFillSize;
-       u16 PciXDevCtl;
-       u8 pci_lat_timer;
-       u8 pci_hdr_type;
-       u8 pci_bist;
-       u32 pci_cfg_state[64 / sizeof(u32)];
-
        /* Registry parameters */
        u8 SpeedDuplex;         /* speed/duplex */
        eFLOW_CONTROL_t RegistryFlowControl;    /* for 802.3x flow control */

diff --git a/drivers/staging/et131x/et131x_config.c b/drivers/staging/et131x/et131x_config.c
index 148672bc3284a8b25625d5bfa6b396f05c99fd94..499cf75bedc971aa18576b97db115b2b85f2e843 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>
@@ -288,7 +289,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;
 

diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c
index d84b6546160f1dd9931d9a36675ab4c039f7a678..86bd55d2aeac4f90939a324cc7bd69c6006b8e9b 100644 (file)
--- a/drivers/staging/et131x/et131x_initpci.c
+++ b/drivers/staging/et131x/et131x_initpci.c
@@ -240,6 +240,7 @@ int et131x_find_adapter(struct et131x_adapter *adapter, struct pci_dev *pdev)
        uint8_t eepromStat;
        uint8_t maxPayload = 0;
        uint8_t read_size_reg;
+       u8 rev;
 
        DBG_ENTER(et131x_dbginfo);
 
@@ -283,15 +284,14 @@ int et131x_find_adapter(struct et131x_adapter *adapter, struct pci_dev *pdev)
         * present, we need to fail.
         */
        if (eepromStat & 0x4C) {
-               result = pci_read_config_byte(pdev, PCI_REVISION_ID,
-                                             &adapter->RevisionID);
+               result = pci_read_config_byte(pdev, PCI_REVISION_ID, &rev);
                if (result != PCIBIOS_SUCCESSFUL) {
                        DBG_ERROR(et131x_dbginfo,
                                  "Could not read PCI config space for "
                                  "Revision ID\n");
                        DBG_LEAVE(et131x_dbginfo);
                        return -EIO;
-               } else if (adapter->RevisionID == 0x01) {
+               } else if (rev == 0x01) {
                        int32_t nLoop;
                        uint8_t ucTemp[4] = { 0xFE, 0x13, 0x10, 0xFF };
 
@@ -405,16 +405,6 @@ int et131x_find_adapter(struct et131x_adapter *adapter, struct pci_dev *pdev)
                return -EIO;
        }
 
-       /* PCI Express Configuration registers 0x48-0x5B (Device Control) */
-       result = pci_read_config_word(pdev, ET1310_PCI_DEV_CTRL,
-                                     &adapter->PciXDevCtl);
-       if (result != PCIBIOS_SUCCESSFUL) {
-               DBG_ERROR(et131x_dbginfo,
-                 "Could not read PCI config space for PCI Express Dev Ctl\n");
-               DBG_LEAVE(et131x_dbginfo);
-               return -EIO;
-       }
-
        /* Get MAC address from config space if an eeprom exists, otherwise
         * the MAC address there will not be valid
         */
@@ -556,7 +546,7 @@ int et131x_adapter_setup(struct et131x_adapter *etdev)
         * We need to turn off 1000 base half dulplex, the mac does not
         * support it. For the 10/100 part, turn off all gig advertisement
         */
-       if (etdev->DeviceID != ET131X_PCI_DEVICE_ID_FAST)
+       if (etdev->pdev->device != ET131X_PCI_DEVICE_ID_FAST)
                ET1310_PhyAdvertise1000BaseT(etdev, TRUEPHY_ADV_DUPLEX_FULL);
        else
                ET1310_PhyAdvertise1000BaseT(etdev, TRUEPHY_ADV_DUPLEX_NONE);
@@ -890,8 +880,6 @@ int __devinit et131x_pci_setup(struct pci_dev *pdev,
        adapter = netdev_priv(netdev);
        adapter->pdev = pdev;
        adapter->netdev = netdev;
-       adapter->VendorID = pdev->vendor;
-       adapter->DeviceID = pdev->device;
 
        /* Do the same for the netdev struct */
        netdev->irq = pdev->irq;