linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: gregory.greenman@intel.com
To: kvalo@kernel.org, johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org,
	Heiner Kallweit <hkallweit1@gmail.com>,
	Johannes Berg <johannes.berg@intel.com>,
	Gregory Greenman <gregory.greenman@intel.com>
Subject: [PATCH 03/12] wifi: iwlwifi: improve tag handling in iwl_request_firmware
Date: Fri, 27 Jan 2023 00:28:12 +0200	[thread overview]
Message-ID: <20230127002430.175bfffdf2f5.I7ec7a29b2d93a977cb0a39dbcc7c875032eb14b7@changeid> (raw)
In-Reply-To: <20230126222821.305122-1-gregory.greenman@intel.com>

From: Heiner Kallweit <hkallweit1@gmail.com>

We can remove the intermediary string conversion and use drv->fw_index
in the final snprintf directly.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index ab7065c93826..4c977ba9cd85 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -163,7 +163,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw,
 static int iwl_request_firmware(struct iwl_drv *drv, bool first)
 {
 	const struct iwl_cfg *cfg = drv->trans->cfg;
-	char tag[8];
 
 	if (drv->trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_9000 &&
 	    (drv->trans->hw_rev_step != SILICON_B_STEP &&
@@ -174,13 +173,10 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
 		return -EINVAL;
 	}
 
-	if (first) {
+	if (first)
 		drv->fw_index = cfg->ucode_api_max;
-		sprintf(tag, "%d", drv->fw_index);
-	} else {
+	else
 		drv->fw_index--;
-		sprintf(tag, "%d", drv->fw_index);
-	}
 
 	if (drv->fw_index < cfg->ucode_api_min) {
 		IWL_ERR(drv, "no suitable firmware found!\n");
@@ -200,8 +196,8 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
 		return -ENOENT;
 	}
 
-	snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
-		 cfg->fw_name_pre, tag);
+	snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%d.ucode",
+		 cfg->fw_name_pre, drv->fw_index);
 
 	IWL_DEBUG_FW_INFO(drv, "attempting to load firmware '%s'\n",
 			  drv->firmware_name);
-- 
2.38.1


  parent reply	other threads:[~2023-01-26 22:36 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-26 22:28 [PATCH 00/12] iwlwifi: updates intended for v6.3 2023-01-27 gregory.greenman
2023-01-26 22:28 ` [PATCH 01/12] wifi: iwlwifi: mvm: report hardware timestamps in RX/TX status gregory.greenman
2023-01-26 22:28 ` [PATCH 02/12] wifi: iwlwifi: mention the response structure in the kerneldoc gregory.greenman
2023-01-26 22:28 ` gregory.greenman [this message]
2023-01-26 22:28 ` [PATCH 04/12] wifi: iwlwifi: mvm: remove h from printk format specifier gregory.greenman
2023-01-26 22:28 ` [PATCH 05/12] wifi: iwlwifi: mvm: always send nullfunc frames on MGMT queue gregory.greenman
2023-01-26 22:28 ` [PATCH 06/12] wifi: iwlwifi: rx: add sniffer support for EHT mode gregory.greenman
2023-01-26 22:28 ` [PATCH 07/12] wifi: iwlwifi: mvm: add sniffer meta data APIs gregory.greenman
2023-01-26 22:28 ` [PATCH 08/12] wifi: iwlwifi: mvm: simplify by using SKB MAC header pointer gregory.greenman
2023-01-26 22:28 ` [PATCH 09/12] wifi: iwlwifi: mvm: Reset rate index if rate is wrong gregory.greenman
2023-01-26 22:28 ` [PATCH 10/12] wifi: iwlwifi: bump FW API to 74 for AX devices gregory.greenman
2023-01-26 22:28 ` [PATCH 11/12] wifi: iwlwifi: mvm: Support STEP equalizer settings from BIOS gregory.greenman
2023-01-26 22:28 ` [PATCH 12/12] wifi: iwlwifi: mei: fix compilation errors in rfkill() gregory.greenman
2023-01-29 16:47 ` [PATCH 00/12] iwlwifi: updates intended for v6.3 2023-01-27 Greenman, Gregory

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230127002430.175bfffdf2f5.I7ec7a29b2d93a977cb0a39dbcc7c875032eb14b7@changeid \
    --to=gregory.greenman@intel.com \
    --cc=hkallweit1@gmail.com \
    --cc=johannes.berg@intel.com \
    --cc=johannes@sipsolutions.net \
    --cc=kvalo@kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).