wifi: iwlwifi: mvm: show full firmware ID in debugfs

The firmware prefix is unused today, but it might still be
useful to have some information. Since the prefix will get
the intel/ directory in some cases, replace the prefix by
the full FW id which has all the information.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240527190228.527a1c72996d.If7588b854149d51605031fc9a70a650534351ef4@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
index 879640a7d46a52ee58befd96c6cac6a3e8b54dd5..2b2b5b76b5ecb49a3f68ad8692668a29720dd58f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -754,7 +754,6 @@ static ssize_t iwl_dbgfs_fw_ver_read(struct file *file, char __user *user_buf,
        struct iwl_mvm *mvm = file->private_data;
        char *buff, *pos, *endpos;
        static const size_t bufsz = 1024;
-       char _fw_name_pre[FW_NAME_PRE_BUFSIZE];
        int ret;
 
        buff = kmalloc(bufsz, GFP_KERNEL);
@@ -764,8 +763,8 @@ static ssize_t iwl_dbgfs_fw_ver_read(struct file *file, char __user *user_buf,
        pos = buff;
        endpos = pos + bufsz;
 
-       pos += scnprintf(pos, endpos - pos, "FW prefix: %s\n",
-                        iwl_drv_get_fwname_pre(mvm->trans, _fw_name_pre));
+       pos += scnprintf(pos, endpos - pos, "FW id: %s\n",
+                        mvm->fwrt.fw->fw_version);
        pos += scnprintf(pos, endpos - pos, "FW: %s\n",
                         mvm->fwrt.fw->human_readable);
        pos += scnprintf(pos, endpos - pos, "Device: %s\n",