wifi: iwlwifi: always print the firmware version in hex

All our firmware versions should now be printed in hex.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240512072733.cae4c562b2c3.I5043383bd0e81f872c55046afd2c6560f482c8e0@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 33654f228ee871f7b8bbe1463351cc677904662a..a392a5f1847f2a89f38ed0d9d19390eceac1e370 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -982,16 +982,10 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
                        minor = le32_to_cpup(ptr++);
                        local_comp = le32_to_cpup(ptr);
 
-                       if (major >= 35)
-                               snprintf(drv->fw.fw_version,
-                                        sizeof(drv->fw.fw_version),
-                                       "%u.%08x.%u %s", major, minor,
-                                       local_comp, iwl_reduced_fw_name(drv));
-                       else
-                               snprintf(drv->fw.fw_version,
-                                        sizeof(drv->fw.fw_version),
-                                       "%u.%u.%u %s", major, minor,
-                                       local_comp, iwl_reduced_fw_name(drv));
+                       snprintf(drv->fw.fw_version,
+                                sizeof(drv->fw.fw_version),
+                                "%u.%08x.%u %s", major, minor,
+                                local_comp, iwl_reduced_fw_name(drv));
                        break;
                        }
                case IWL_UCODE_TLV_FW_DBG_DEST: {