1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index aea0fe9d1779..8027138c47e9 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -747,14 +747,11 @@ static int iwl_pcie_load_given_ucode(struct iwl_trans *trans,
         int first_ucode_section;
 
         IWL_DEBUG_FW(trans,
-                     "working with %s image\n",
-                     image->is_secure ? "Secured" : "Non Secured");
-        IWL_DEBUG_FW(trans,
                      "working with %s CPU\n",
                      image->is_dual_cpus ? "Dual" : "Single");
 
         /* configure the ucode to be ready to get the secured image */
-        if (image->is_secure) {
+        if (iwl_has_secure_boot(trans->hw_rev, trans->cfg->device_family)) {
                 /* set secure boot inspector addresses */
                 iwl_write_prph(trans,
                                LMPM_SECURE_INSPECTOR_CODE_ADDR,
@@ -790,7 +787,8 @@ static int iwl_pcie_load_given_ucode(struct iwl_trans *trans,
                                LMPM_SECURE_CPU2_HDR_MEM_SPACE);
 
                 /* load to FW the binary sections of CPU2 */
-                if (image->is_secure)
+                if (iwl_has_secure_boot(trans->hw_rev,
+                                        trans->cfg->device_family))
                         ret = iwl_pcie_load_cpu_secured_sections(
                                                         trans, image, 2,
                                                         &first_ucode_section);
@@ -821,7 +819,7 @@ static int iwl_pcie_load_given_ucode(struct iwl_trans *trans,
         else
                 iwl_write32(trans, CSR_RESET, 0);
 
-        if (image->is_secure) {
+        if (iwl_has_secure_boot(trans->hw_rev, trans->cfg->device_family)) {
                 /* wait for image verification to complete  */
                 ret = iwl_poll_prph_bit(trans,
                                         LMPM_SECURE_BOOT_CPU1_STATUS_ADDR,