wifi: iwlwifi: remove redundant reading from NVM file
authorChaya Rachel Ivgi <chaya.rachel.ivgi@intel.com>
Fri, 10 May 2024 14:06:41 +0000 (17:06 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 23 May 2024 08:51:11 +0000 (10:51 +0200)
The driver reads xtal_calib from NVM file, but actually never uses it.
This is only used in dvm driver.

Signed-off-by: Chaya Rachel Ivgi <chaya.rachel.ivgi@intel.com>
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240510170500.c4d1a4571049.I7d7b73dccb793e220f023e0d049b082b043ca95e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

index cf5c9500af8c85d9db034679113e27caa1e39752..5132964661c8093308c53f8ecc10aec3c52bf620 100644 (file)
@@ -38,16 +38,13 @@ enum nvm_offsets {
        N_HW_ADDRS = 3,
        NVM_CHANNELS = 0x1E0 - NVM_SW_SECTION,
 
-       /* NVM calibration section offset (in words) definitions */
-       NVM_CALIB_SECTION = 0x2B8,
-       XTAL_CALIB = 0x316 - NVM_CALIB_SECTION,
-
        /* NVM REGULATORY -Section offset (in words) definitions */
        NVM_CHANNELS_SDP = 0,
 };
 
 enum ext_nvm_offsets {
        /* NVM HW-Section offset (in words) definitions */
+
        MAC_ADDRESS_OVERRIDE_EXT_NVM = 1,
 
        /* NVM SW-Section offset (in words) definitions */
@@ -1574,9 +1571,6 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,
                             &regulatory[NVM_CHANNELS_SDP] :
                             &nvm_sw[NVM_CHANNELS];
 
-               /* in family 8000 Xtal calibration values moved to OTP */
-               data->xtal_calib[0] = *(nvm_calib + XTAL_CALIB);
-               data->xtal_calib[1] = *(nvm_calib + XTAL_CALIB + 1);
                lar_enabled = true;
        } else {
                u16 lar_offset = data->nvm_version < 0xE39 ?