diff options
| author | Sara Sharon <sara.sharon@intel.com> | 2016-03-01 12:18:22 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-03-07 13:33:00 +0200 |
| commit | afd5b1704cb15eabc4358b7b0dd7f33099408eaa (patch) | |
| tree | 5e1d9e2c485d5f8aa700f857fb7faaa184cb8f38 /drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | |
| parent | 91f66a3c672065a3aca387ca7e0028504bb8f457 (diff) | |
| download | linux-afd5b1704cb15eabc4358b7b0dd7f33099408eaa.tar.gz linux-afd5b1704cb15eabc4358b7b0dd7f33099408eaa.tar.bz2 linux-afd5b1704cb15eabc4358b7b0dd7f33099408eaa.zip | |
iwlwifi: refactor the code that reads the MAC address from the NVM
It makes it slightly easier to follow. Pass the pointer to
the transport which allows to read WFMP_MAC_ADDR_X register
only when needed and to use IWL_ERR instead of the less
commonly used IWL_ERR_DEV logger macro.
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h index 4e8e0dc474d4..d704d52aa7ec 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h @@ -74,12 +74,11 @@ * later with iwl_free_nvm_data(). */ struct iwl_nvm_data * -iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg, +iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg, const __le16 *nvm_hw, const __le16 *nvm_sw, const __le16 *nvm_calib, const __le16 *regulatory, const __le16 *mac_override, const __le16 *phy_sku, - u8 tx_chains, u8 rx_chains, bool lar_fw_supported, - __le32 mac_addr0, __le32 mac_addr1); + u8 tx_chains, u8 rx_chains, bool lar_fw_supported); /** * iwl_parse_mcc_info - parse MCC (mobile country code) info coming from FW |