iwlwifi: Change define and struct names in iwl-eeprom-parse.h

Since we will have several forms of NVM (EEPROM, OTP, etc.)
and they will have different layouts, make the parsed data
more generic. This allows functional code to be independent
of a specific layout.

Also change some variables and function names from having
"eeprom" to "nvm" in their name.

Signed-off-by: Eytan Lifshitz <eytan.lifshitz@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

4 files changed, 32 insertions, 32 deletions

diff --git a/drivers/net/wireless/iwlwifi/pcie/1000.c b/drivers/net/wireless/iwlwifi/pcie/1000.c
index 81b83f484f08..f8620ecae6b4 100644
--- a/drivers/net/wireless/iwlwifi/pcie/1000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/1000.c
@@ -94,8 +94,8 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = {
         .device_family = IWL_DEVICE_FAMILY_1000,                \
         .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
         .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
-        .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_1000_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,  \
         .base_params = &iwl1000_base_params,                    \
         .eeprom_params = &iwl1000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK
@@ -119,8 +119,8 @@ const struct iwl_cfg iwl1000_bg_cfg = {
         .device_family = IWL_DEVICE_FAMILY_100,                 \
         .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
         .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
-        .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_1000_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,  \
         .base_params = &iwl1000_base_params,                    \
         .eeprom_params = &iwl1000_eeprom_params,                \
         .led_mode = IWL_LED_RF_STATE,                           \
diff --git a/drivers/net/wireless/iwlwifi/pcie/2000.c b/drivers/net/wireless/iwlwifi/pcie/2000.c
index 9fbde32f7559..244019cec3e1 100644
--- a/drivers/net/wireless/iwlwifi/pcie/2000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/2000.c
@@ -138,8 +138,8 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = {
         .device_family = IWL_DEVICE_FAMILY_2000,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
-        .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_2000_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,  \
         .base_params = &iwl2000_base_params,                    \
         .eeprom_params = &iwl20x0_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
@@ -166,8 +166,8 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = {
         .device_family = IWL_DEVICE_FAMILY_2030,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
-        .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_2000_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,  \
         .base_params = &iwl2030_base_params,                    \
         .bt_params = &iwl2030_bt_params,                        \
         .eeprom_params = &iwl20x0_eeprom_params,                \
@@ -190,8 +190,8 @@ const struct iwl_cfg iwl2030_2bgn_cfg = {
         .device_family = IWL_DEVICE_FAMILY_105,                 \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
-        .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_2000_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,  \
         .base_params = &iwl2000_base_params,                    \
         .eeprom_params = &iwl20x0_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
@@ -220,8 +220,8 @@ const struct iwl_cfg iwl105_bgn_d_cfg = {
         .device_family = IWL_DEVICE_FAMILY_135,                 \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
-        .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_2000_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,  \
         .base_params = &iwl2030_base_params,                    \
         .bt_params = &iwl2030_bt_params,                        \
         .eeprom_params = &iwl20x0_eeprom_params,                \
diff --git a/drivers/net/wireless/iwlwifi/pcie/5000.c b/drivers/net/wireless/iwlwifi/pcie/5000.c
index d1665fa6d15a..83ca40321ff1 100644
--- a/drivers/net/wireless/iwlwifi/pcie/5000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/5000.c
@@ -92,8 +92,8 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = {
         .device_family = IWL_DEVICE_FAMILY_5000,                \
         .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
         .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
-        .eeprom_ver = EEPROM_5000_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_5000_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION,  \
         .base_params = &iwl5000_base_params,                    \
         .eeprom_params = &iwl5000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK
@@ -139,8 +139,8 @@ const struct iwl_cfg iwl5350_agn_cfg = {
         .device_family = IWL_DEVICE_FAMILY_5000,
         .max_inst_size = IWLAGN_RTC_INST_SIZE,
         .max_data_size = IWLAGN_RTC_DATA_SIZE,
-        .eeprom_ver = EEPROM_5050_EEPROM_VERSION,
-        .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,
+        .nvm_ver = EEPROM_5050_EEPROM_VERSION,
+        .nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,
         .base_params = &iwl5000_base_params,
         .eeprom_params = &iwl5000_eeprom_params,
         .ht_params = &iwl5000_ht_params,
@@ -156,8 +156,8 @@ const struct iwl_cfg iwl5350_agn_cfg = {
         .device_family = IWL_DEVICE_FAMILY_5150,                \
         .max_inst_size = IWLAGN_RTC_INST_SIZE,                  \
         .max_data_size = IWLAGN_RTC_DATA_SIZE,                  \
-        .eeprom_ver = EEPROM_5050_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_5050_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,  \
         .base_params = &iwl5000_base_params,                    \
         .eeprom_params = &iwl5000_eeprom_params,                \
         .no_xtal_calib = true,                                  \
diff --git a/drivers/net/wireless/iwlwifi/pcie/6000.c b/drivers/net/wireless/iwlwifi/pcie/6000.c
index 4a57624afc40..d4df976d4709 100644
--- a/drivers/net/wireless/iwlwifi/pcie/6000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/6000.c
@@ -160,8 +160,8 @@ static const struct iwl_eeprom_params iwl6000_eeprom_params = {
         .device_family = IWL_DEVICE_FAMILY_6005,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
-        .eeprom_ver = EEPROM_6005_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_6005_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_6005_TX_POWER_VERSION,  \
         .base_params = &iwl6000_g2_base_params,                 \
         .eeprom_params = &iwl6000_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
@@ -215,8 +215,8 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = {
         .device_family = IWL_DEVICE_FAMILY_6030,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
-        .eeprom_ver = EEPROM_6030_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_6030_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,  \
         .base_params = &iwl6000_g2_base_params,                 \
         .bt_params = &iwl6000_bt_params,                        \
         .eeprom_params = &iwl6000_eeprom_params,                \
@@ -254,8 +254,8 @@ const struct iwl_cfg iwl6030_2bg_cfg = {
         .device_family = IWL_DEVICE_FAMILY_6030,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
-        .eeprom_ver = EEPROM_6030_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_6030_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,  \
         .base_params = &iwl6000_g2_base_params,                 \
         .bt_params = &iwl6000_bt_params,                        \
         .eeprom_params = &iwl6000_eeprom_params,                \
@@ -306,8 +306,8 @@ const struct iwl_cfg iwl130_bg_cfg = {
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .valid_tx_ant = ANT_BC,         /* .cfg overwrite */    \
         .valid_rx_ant = ANT_BC,         /* .cfg overwrite */    \
-        .eeprom_ver = EEPROM_6000_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_6000_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,  \
         .base_params = &iwl6000_base_params,                    \
         .eeprom_params = &iwl6000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK
@@ -337,8 +337,8 @@ const struct iwl_cfg iwl6000i_2bg_cfg = {
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .valid_tx_ant = ANT_AB,         /* .cfg overwrite */    \
         .valid_rx_ant = ANT_AB,         /* .cfg overwrite */    \
-        .eeprom_ver = EEPROM_6050_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_6050_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_6050_TX_POWER_VERSION,  \
         .base_params = &iwl6050_base_params,                    \
         .eeprom_params = &iwl6000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK,                              \
@@ -362,8 +362,8 @@ const struct iwl_cfg iwl6050_2abg_cfg = {
         .device_family = IWL_DEVICE_FAMILY_6150,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
-        .eeprom_ver = EEPROM_6150_EEPROM_VERSION,               \
-        .eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,       \
+        .nvm_ver = EEPROM_6150_EEPROM_VERSION,          \
+        .nvm_calib_ver = EEPROM_6150_TX_POWER_VERSION,  \
         .base_params = &iwl6050_base_params,                    \
         .eeprom_params = &iwl6000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK,                              \
@@ -389,8 +389,8 @@ const struct iwl_cfg iwl6000_3agn_cfg = {
         .device_family = IWL_DEVICE_FAMILY_6000,
         .max_inst_size = IWL60_RTC_INST_SIZE,
         .max_data_size = IWL60_RTC_DATA_SIZE,
-        .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
-        .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
+        .nvm_ver = EEPROM_6000_EEPROM_VERSION,
+        .nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,
         .base_params = &iwl6000_base_params,
         .eeprom_params = &iwl6000_eeprom_params,
         .ht_params = &iwl6000_ht_params,