redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Staging: et131x: kill copied PCI fields

Browse source 
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>
This commit is contained in:
Alan Cox 2009-08-27 10:59:13 +01:00 committed by Greg Kroah-Hartman
parent 817550815e
commit 5ec3487ac5
5 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/et131x/et1310_eeprom.c
View file

@ -292,7 +292,7 @@ int32_t EepromWriteByte(struct et131x_adapter *etdev, uint32_t unAddress,
* so we do a blind write for load bug. * so we do a blind write for load bug.
*/ */
if (bStatus & LBCIF_STATUS_GENERAL_ERROR if (bStatus & LBCIF_STATUS_GENERAL_ERROR
&& etdev->RevisionID == 0) { && etdev->pdev->revision == 0) {
break; break;
} }

2
drivers/staging/et131x/et1310_phy.c
View file

@ -841,7 +841,7 @@ void TPAL_SetPhyAutoNeg(struct et131x_adapter *etdev)
ET1310_PhyAdvertise100BaseT(etdev, TRUEPHY_ADV_DUPLEX_BOTH); 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); ET1310_PhyAdvertise1000BaseT(etdev, TRUEPHY_ADV_DUPLEX_FULL);
else else
ET1310_PhyAdvertise1000BaseT(etdev, TRUEPHY_ADV_DUPLEX_NONE); ET1310_PhyAdvertise1000BaseT(etdev, TRUEPHY_ADV_DUPLEX_NONE);

13
drivers/staging/et131x/et131x_adapter.h
View file

@ -250,19 +250,6 @@ struct et131x_adapter {
/* Pointer to the device's PCI register space */ /* Pointer to the device's PCI register space */
ADDRESS_MAP_t __iomem *CSRAddress; 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 */ /* Registry parameters */
u8 SpeedDuplex; /* speed/duplex */ u8 SpeedDuplex; /* speed/duplex */
eFLOW_CONTROL_t RegistryFlowControl; /* for 802.3x flow control */ eFLOW_CONTROL_t RegistryFlowControl; /* for 802.3x flow control */

3
drivers/staging/et131x/et131x_config.c
View file

@ -76,6 +76,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/pci.h>
#include <asm/system.h> #include <asm/system.h>
#include <linux/netdevice.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 /* If we are the 10/100 device, and gigabit is somehow requested then
* knock it down to 100 full. * 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 == 5)
etdev->SpeedDuplex = 4; etdev->SpeedDuplex = 4;

20
drivers/staging/et131x/et131x_initpci.c
View file

@ -240,6 +240,7 @@ int et131x_find_adapter(struct et131x_adapter *adapter, struct pci_dev *pdev)
uint8_t eepromStat; uint8_t eepromStat;
uint8_t maxPayload = 0; uint8_t maxPayload = 0;
uint8_t read_size_reg; uint8_t read_size_reg;
u8 rev;
DBG_ENTER(et131x_dbginfo); 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. * present, we need to fail.
*/ */
if (eepromStat & 0x4C) { if (eepromStat & 0x4C) {
result = pci_read_config_byte(pdev, PCI_REVISION_ID, result = pci_read_config_byte(pdev, PCI_REVISION_ID, &rev);
&adapter->RevisionID);
if (result != PCIBIOS_SUCCESSFUL) { if (result != PCIBIOS_SUCCESSFUL) {
DBG_ERROR(et131x_dbginfo, DBG_ERROR(et131x_dbginfo,
"Could not read PCI config space for " "Could not read PCI config space for "
"Revision ID\n"); "Revision ID\n");
DBG_LEAVE(et131x_dbginfo); DBG_LEAVE(et131x_dbginfo);
return -EIO; return -EIO;
} else if (adapter->RevisionID == 0x01) { } else if (rev == 0x01) {
int32_t nLoop; int32_t nLoop;
uint8_t ucTemp[4] = { 0xFE, 0x13, 0x10, 0xFF }; 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; 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 /* Get MAC address from config space if an eeprom exists, otherwise
* the MAC address there will not be valid * 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 * 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 * 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); ET1310_PhyAdvertise1000BaseT(etdev, TRUEPHY_ADV_DUPLEX_FULL);
else else
ET1310_PhyAdvertise1000BaseT(etdev, TRUEPHY_ADV_DUPLEX_NONE); 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 = netdev_priv(netdev);
adapter->pdev = pdev; adapter->pdev = pdev;
adapter->netdev = netdev; adapter->netdev = netdev;
adapter->VendorID = pdev->vendor;
adapter->DeviceID = pdev->device;
/* Do the same for the netdev struct */ /* Do the same for the netdev struct */
netdev->irq = pdev->irq; netdev->irq = pdev->irq;