igc: Remove obsolete nvm type

i225 devices use only spi nvm type. This patch comes to tidy up
obsolete nvm types.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Nechama Kraus <nechamax.kraus@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/igc/igc_hw.h b/drivers/net/ethernet/intel/igc/igc_hw.h
index 76832e55cbbbd0dab98283c0f105a7e620599f41..b1e72ec5f1319dd59f48932fe79d663a55f41d24 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_hw.h
+++ b/drivers/net/ethernet/intel/igc/igc_hw.h
@@ -67,8 +67,6 @@ enum igc_media_type {
 enum igc_nvm_type {
        igc_nvm_unknown = 0,
        igc_nvm_eeprom_spi,
-       igc_nvm_flash_hw,
-       igc_nvm_invm,
 };
 
 struct igc_info {

diff --git a/drivers/net/ethernet/intel/igc/igc_i225.c b/drivers/net/ethernet/intel/igc/igc_i225.c
index b6807e16eea9393304c7abb68f90648a7bd1c968..66ea566488d12bc7d5245e2d2dab959c9b3d3ab5 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_i225.c
+++ b/drivers/net/ethernet/intel/igc/igc_i225.c
@@ -473,13 +473,11 @@ s32 igc_init_nvm_params_i225(struct igc_hw *hw)
 
        /* NVM Function Pointers */
        if (igc_get_flash_presence_i225(hw)) {
-               hw->nvm.type = igc_nvm_flash_hw;
                nvm->ops.read = igc_read_nvm_srrd_i225;
                nvm->ops.write = igc_write_nvm_srwr_i225;
                nvm->ops.validate = igc_validate_nvm_checksum_i225;
                nvm->ops.update = igc_update_nvm_checksum_i225;
        } else {
-               hw->nvm.type = igc_nvm_invm;
                nvm->ops.read = igc_read_nvm_eerd;
                nvm->ops.write = NULL;
                nvm->ops.validate = NULL;