svn commit: r306006 - head/sys/dev/iwm

[Imre Vadász]

Author: ivadasz
Date: Mon Sep 19 22:26:37 2016
New Revision: 306006
URL: https://svnweb.freebsd.org/changeset/base/306006

Log:
  [iwm] Remove dead fw_totlen from struct iwm_fw_sects; clean up struct iwm_nvm_data.
  
  * No functional change, none of these values were ever read.
  
  * The values removed from struct iwm_nvm_data are only used for old dvm
    devices in Linux iwlwifi, and irrelevant to iwm hence.
  
  Approved by:	adrian (mentor)
  Differential Revision:	https://reviews.freebsd.org/D7945

Modified:
  head/sys/dev/iwm/if_iwm.c
  head/sys/dev/iwm/if_iwmvar.h

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c	Mon Sep 19 22:23:46 2016	(r306005)
+++ head/sys/dev/iwm/if_iwm.c	Mon Sep 19 22:26:37 2016	(r306006)
@@ -437,7 +437,6 @@ iwm_firmware_store_section(struct iwm_so
 	fwone->fws_len = dlen - sizeof(uint32_t);
 
 	fws->fw_count++;
-	fws->fw_totlen += fwone->fws_len;
 
 	return 0;
 }
@@ -2151,11 +2150,6 @@ iwm_parse_nvm_data(struct iwm_softc *sc,
 		memcpy(data->nvm_ch_flags, &regulatory[IWM_NVM_CHANNELS_8000],
 		    IWM_NUM_CHANNELS_8000 * sizeof(uint16_t));
 	}
-	data->calib_version = 255;   /* TODO:
-					this value will prevent some checks from
-					failing, we need to check if this
-					field is still needed, and if it does,
-					where is it in the NVM */
 
 	return 0;
 }

Modified: head/sys/dev/iwm/if_iwmvar.h
==============================================================================
--- head/sys/dev/iwm/if_iwmvar.h	Mon Sep 19 22:23:46 2016	(r306005)
+++ head/sys/dev/iwm/if_iwmvar.h	Mon Sep 19 22:26:37 2016	(r306006)
@@ -170,7 +170,6 @@ struct iwm_fw_info {
 			uint32_t fws_len;
 			uint32_t fws_devoff;
 		} fw_sect[IWM_UCODE_SECT_MAX];
-		size_t fw_totlen;
 		int fw_count;
 	} fw_sects[IWM_UCODE_TYPE_MAX];
 };
@@ -179,14 +178,6 @@ struct iwm_nvm_data {
 	int n_hw_addrs;
 	uint8_t hw_addr[IEEE80211_ADDR_LEN];
 
-	uint8_t calib_version;
-	uint16_t calib_voltage;
-
-	uint16_t raw_temperature;
-	uint16_t kelvin_temperature;
-	uint16_t kelvin_voltage;
-	uint16_t xtal_calib[2];
-
 	int sku_cap_band_24GHz_enable;
 	int sku_cap_band_52GHz_enable;
 	int sku_cap_11n_enable;