From alan@linux.intel.com Thu Aug 27 14:26:37 2009 From: Alan Cox Date: Thu, 27 Aug 2009 11:01:04 +0100 Subject: Staging: et131x: eeprom remove features To: greg@kroah.com Message-ID: <20090827100101.23892.56276.stgit@localhost.localdomain> We only read eeprom id 0, in byte mode - so the rest can go away Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- drivers/staging/et131x/et1310_eeprom.c | 20 ++------------------ drivers/staging/et131x/et1310_eeprom.h | 16 ++-------------- drivers/staging/et131x/et131x_config.c | 0 drivers/staging/et131x/et1310_eeprom.c | 20 ++------------------ drivers/staging/et131x/et1310_eeprom.h | 16 ++-------------- drivers/staging/et131x/et131x_initpci.c | 7 +++---- 3 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 drivers/staging/et131x/et131x_config.c --- a/drivers/staging/et131x/et1310_eeprom.c +++ b/drivers/staging/et131x/et1310_eeprom.c @@ -146,14 +146,10 @@ * @etdev: pointer to our private adapter structure * @addr: the address to write * @data: the value to write - * @eeprom_id: the ID of the EEPROM - * @addrmode: how the EEPROM is to be accessed * * Returns SUCCESS or FAILURE */ -int EepromWriteByte(struct et131x_adapter *etdev, u32 addr, - u8 data, u32 eeprom_id, - u32 addrmode) +int EepromWriteByte(struct et131x_adapter *etdev, u32 addr, u8 data) { struct pci_dev *pdev = etdev->pdev; int index; @@ -238,9 +234,6 @@ int EepromWriteByte(struct et131x_adapte control = 0; control |= LBCIF_CONTROL_LBCIF_ENABLE | LBCIF_CONTROL_I2C_WRITE; - if (addrmode == DUAL_BYTE) - control |= LBCIF_CONTROL_TWO_BYTE_ADDR; - if (pci_write_config_byte(pdev, LBCIF_CONTROL_REGISTER_OFFSET, control)) { return FAILURE; @@ -249,8 +242,6 @@ int EepromWriteByte(struct et131x_adapte i2c_wack = 1; /* Prepare EEPROM address for Step 3 */ - addr |= (addrmode == DUAL_BYTE) ? - (eeprom_id << 16) : (eeprom_id << 8); for (retries = 0; retries < MAX_NUM_WRITE_RETRIES; retries++) { /* Step 3:*/ @@ -357,9 +348,7 @@ int EepromWriteByte(struct et131x_adapte * * Returns SUCCESS or FAILURE */ -int EepromReadByte(struct et131x_adapter *etdev, u32 addr, - u8 *pdata, u32 eeprom_id, - u32 addrmode) +int EepromReadByte(struct et131x_adapter *etdev, u32 addr, u8 *pdata) { struct pci_dev *pdev = etdev->pdev; int index; @@ -427,17 +416,12 @@ int EepromReadByte(struct et131x_adapter control = 0; control |= LBCIF_CONTROL_LBCIF_ENABLE; - if (addrmode == DUAL_BYTE) - control |= LBCIF_CONTROL_TWO_BYTE_ADDR; - if (pci_write_config_byte(pdev, LBCIF_CONTROL_REGISTER_OFFSET, control)) { return FAILURE; } /* Step 3: */ - addr |= (addrmode == DUAL_BYTE) ? - (eeprom_id << 16) : (eeprom_id << 8); if (pci_write_config_dword(pdev, LBCIF_ADDRESS_REGISTER_OFFSET, addr)) { --- a/drivers/staging/et131x/et1310_eeprom.h +++ b/drivers/staging/et131x/et1310_eeprom.h @@ -66,24 +66,12 @@ #define FAILURE 1 #endif -#ifndef READ -#define READ 0 -#define WRITE 1 -#endif - -#ifndef SINGLE_BYTE -#define SINGLE_BYTE 0 -#define DUAL_BYTE 1 -#endif - /* Forward declaration of the private adapter structure */ struct et131x_adapter; int32_t EepromWriteByte(struct et131x_adapter *adapter, u32 unAddress, - u8 bData, u32 unEepromId, - u32 unAddressingMode); + u8 bData); int32_t EepromReadByte(struct et131x_adapter *adapter, u32 unAddress, - u8 *pbData, u32 unEepromId, - u32 unAddressingMode); + u8 *pbData); #endif /* _ET1310_EEPROM_H_ */ --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c @@ -337,8 +337,7 @@ int et131x_find_adapter(struct et131x_ad * corruption seen with 1310 B Silicon */ for (nLoop = 0; nLoop < 3; nLoop++) { - EepromWriteByte(adapter, nLoop, temp[nLoop], - 0, SINGLE_BYTE); + EepromWriteByte(adapter, nLoop, temp[nLoop]); } } @@ -364,8 +363,8 @@ int et131x_find_adapter(struct et131x_ad /* Read the EEPROM for information regarding LED behavior. Refer to * ET1310_phy.c, et131x_xcvr_init(), for its use. */ - EepromReadByte(adapter, 0x70, &adapter->eepromData[0], 0, SINGLE_BYTE); - EepromReadByte(adapter, 0x71, &adapter->eepromData[1], 0, SINGLE_BYTE); + EepromReadByte(adapter, 0x70, &adapter->eepromData[0]); + EepromReadByte(adapter, 0x71, &adapter->eepromData[1]); if (adapter->eepromData[0] != 0xcd) /* Disable all optional features */