diff options
| author | Sharon Dvir <sharon.dvir@intel.com> | 2016-08-03 10:55:45 +0300 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2016-09-16 09:10:32 +0300 |
| commit | 612da1efc07f28ea9e64402820dd25287ff5233b (patch) | |
| tree | 65e0fdb2052615f5188de5638298f7336e7949cc /drivers/net/wireless/intel/iwlwifi/dvm | |
| parent | 9fb064df6d57bf09ed3f8f964c8b0789b55206e7 (diff) | |
| download | linux-612da1efc07f28ea9e64402820dd25287ff5233b.tar.xz | |
iwlwifi: unify iwl_get_ucode_image() implementations
Avoid multiple implementations.
Signed-off-by: Sharon Dvir <sharon.dvir@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/dvm')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/ucode.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c b/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c index b662cf35b033..c7509c51e9d9 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c @@ -46,15 +46,6 @@ * ******************************************************************************/ -static inline const struct fw_img * -iwl_get_ucode_image(struct iwl_priv *priv, enum iwl_ucode_type ucode_type) -{ - if (ucode_type >= IWL_UCODE_TYPE_MAX) - return NULL; - - return &priv->fw->img[ucode_type]; -} - /* * Calibration */ @@ -330,7 +321,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv, enum iwl_ucode_type old_type; static const u16 alive_cmd[] = { REPLY_ALIVE }; - fw = iwl_get_ucode_image(priv, ucode_type); + fw = iwl_get_ucode_image(priv->fw, ucode_type); if (WARN_ON(!fw)) return -EINVAL; |