Commit 67d204a5 authored by Auke Kok's avatar Auke Kok Committed by Jeff Garzik
Browse files

e1000e: remove no longer used e1000e_read_nvm_spi 



This function is no longer used now that 82573 uses the eerd
read method as well. Thanks to Adrian Bunk for pointing this out.

Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent a9340b86

drivers/net/e1000e/e1000.h

+0 −1
Original line number Diff line number Diff line
@@ -462,7 +462,6 @@ extern s32 e1000e_acquire_nvm(struct e1000_hw *hw); 
extern s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

extern s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);

extern s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);

extern s32 e1000e_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

extern s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);

extern s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);

extern void e1000e_release_nvm(struct e1000_hw *hw);

drivers/net/e1000e/lib.c

+0 −56
Original line number Diff line number Diff line
@@ -1851,62 +1851,6 @@ static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw) 
	return 0;

}



/**

 *  e1000e_read_nvm_spi - Reads EEPROM using SPI

 *  @hw: pointer to the HW structure

 *  @offset: offset of word in the EEPROM to read

 *  @words: number of words to read

 *  @data: word read from the EEPROM

 *

 *  Reads a 16 bit word from the EEPROM.

 **/

s32 e1000e_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)

{

	struct e1000_nvm_info *nvm = &hw->nvm;

	u32 i = 0;

	s32 ret_val;

	u16 word_in;

	u8 read_opcode = NVM_READ_OPCODE_SPI;



	/* A check for invalid values:  offset too large, too many words,

	 * and not enough words. */

	if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||

	    (words == 0)) {

		hw_dbg(hw, "nvm parameter(s) out of bounds\n");

		return -E1000_ERR_NVM;

	}



	ret_val = nvm->ops.acquire_nvm(hw);

	if (ret_val)

		return ret_val;



	ret_val = e1000_ready_nvm_eeprom(hw);

	if (ret_val) {

		nvm->ops.release_nvm(hw);

		return ret_val;

	}



	e1000_standby_nvm(hw);



	if ((nvm->address_bits == 8) && (offset >= 128))

		read_opcode |= NVM_A8_OPCODE_SPI;



	/* Send the READ command (opcode + addr) */

	e1000_shift_out_eec_bits(hw, read_opcode, nvm->opcode_bits);

	e1000_shift_out_eec_bits(hw, (u16)(offset*2), nvm->address_bits);



	/* Read the data.  SPI NVMs increment the address with each byte

	 * read and will roll over if reading beyond the end.  This allows

	 * us to read the whole NVM from any offset */

	for (i = 0; i < words; i++) {

		word_in = e1000_shift_in_eec_bits(hw, 16);

		data[i] = (word_in >> 8) | (word_in << 8);

	}



	nvm->ops.release_nvm(hw);

	return 0;

}



/**

 *  e1000e_read_nvm_eerd - Reads EEPROM using EERD register

 *  @hw: pointer to the HW structure