diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2023-06-21 13:12:18 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-06-21 14:07:01 +0200 |
| commit | 31aeae2446d50665b6ec51d564f5e7fe751d53d4 (patch) | |
| tree | 036a74848c8871bd262fb637f74328425cc8d038 /drivers/net/wireless/intel/iwlwifi/iwl-drv.c | |
| parent | wifi: iwlwifi: also unify Ma device configurations (diff) | |
| download | linux-31aeae2446d50665b6ec51d564f5e7fe751d53d4.tar.xz linux-31aeae2446d50665b6ec51d564f5e7fe751d53d4.zip | |
wifi: iwlwifi: cfg: remove trailing dash from FW_PRE constants
We have the trailing dash here, but that complicates all
the code. Simplify this by removing the dashes, adding
them to the *_MODULE_FIRMWARE macros, and adjusting the
code using this accordingly.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230621130443.72240ca13b83.I1f4ed547f0964719ed98a3ef928080462d594491@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-drv.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index a7cf73d67371..3d87d26845e7 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -174,7 +174,7 @@ const char *iwl_drv_get_fwname_pre(struct iwl_trans *trans, char *buf) return trans->cfg->fw_name_pre; if (WARN_ON(!trans->cfg->fw_name_mac)) - return "unconfigured-"; + return "unconfigured"; mac_step = iwl_drv_get_step(trans->hw_rev_step); @@ -199,7 +199,7 @@ const char *iwl_drv_get_fwname_pre(struct iwl_trans *trans, char *buf) rf = "wh"; break; default: - return "unknown-rf-"; + return "unknown-rf"; } cdb = CSR_HW_RFID_IS_CDB(trans->hw_rf_id) ? "4" : ""; @@ -244,12 +244,12 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first) IWL_ERR(drv, "no suitable firmware found!\n"); if (cfg->ucode_api_min == cfg->ucode_api_max) { - IWL_ERR(drv, "%s%d is required\n", fw_name_pre, + IWL_ERR(drv, "%s-%d is required\n", fw_name_pre, cfg->ucode_api_max); } else { - IWL_ERR(drv, "minimum version required: %s%d\n", + IWL_ERR(drv, "minimum version required: %s-%d\n", fw_name_pre, cfg->ucode_api_min); - IWL_ERR(drv, "maximum version supported: %s%d\n", + IWL_ERR(drv, "maximum version supported: %s-%d\n", fw_name_pre, cfg->ucode_api_max); } @@ -258,7 +258,7 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first) return -ENOENT; } - snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%d.ucode", + snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s-%d.ucode", fw_name_pre, drv->fw_index); IWL_DEBUG_FW_INFO(drv, "attempting to load firmware '%s'\n", |