diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-08-27 11:01:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:28 -0700 |
| commit | 13071fded6df0979d50307a463be819377fc2822 (patch) | |
| tree | 4800f56689c7d61c9cc9d5789b320ce988b7aeb0 /drivers/staging/et131x/et1310_eeprom.c | |
| parent | c6c9f8cb38d369985c66b73ed8c15dc9cec7bd09 (diff) | |
| download | op-kernel-dev-13071fded6df0979d50307a463be819377fc2822.zip op-kernel-dev-13071fded6df0979d50307a463be819377fc2822.tar.gz | |
Staging: et131x: eeprom remove features
We only read eeprom id 0, in byte mode - so the rest can go away
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_eeprom.c')
| -rw-r--r-- | drivers/staging/et131x/et1310_eeprom.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/staging/et131x/et1310_eeprom.c b/drivers/staging/et131x/et1310_eeprom.c index 9453862..7b2e4ea 100644 --- 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_adapter *etdev, u32 addr, 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_adapter *etdev, u32 addr, 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_adapter *etdev, u32 addr, * * 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 *etdev, u32 addr, 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)) { |
