diff options
| author |   Don Fry <donald.h.fry@intel.com> | 2011-11-30 15:37:32 -0800 |
|---|---|---|
| committer |   Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-12-08 15:55:08 -0800 |
| commit | ab36eab24e7847d6d92872c55b46554c8ac4c4b3 (patch) | |
| tree | 6017a2a34e4630cf3ebdaec33818efa1fbe8f0d3 /drivers/net/wireless/iwlwifi/iwl-debugfs.c | |
| parent | iwlwifi: set TX_CMD_FLG_STA_RATE_MSK for BAR frame (diff) | |
| download | linux-dev-ab36eab24e7847d6d92872c55b46554c8ac4c4b3.tar.xz linux-dev-ab36eab24e7847d6d92872c55b46554c8ac4c4b3.zip | |
iwlwifi: move eeprom pointer from iwl_priv to iwl_shared
The eeprom image is a device level component, move from iwl_priv
to iwl_shared, with associated code changes.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-debugfs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index ccbcab40e78f..6bf6845e1a51 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c @@ -416,7 +416,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, return -ENODATA; } - ptr = priv->eeprom; + ptr = priv->shrd->eeprom; if (!ptr) { IWL_ERR(priv, "Invalid EEPROM/OTP memory\n"); return -ENOMEM; @@ -428,7 +428,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, IWL_ERR(priv, "Can not allocate Buffer\n"); return -ENOMEM; } - eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION); + eeprom_ver = iwl_eeprom_query16(priv->shrd, EEPROM_VERSION); pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s, " "version: 0x%x\n", (trans(priv)->nvm_device_type == NVM_DEVICE_TYPE_OTP) |