From: gregory.greenman@intel.com
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org,
Mukesh Sisodiya <mukesh.sisodiya@intel.com>,
Gregory Greenman <gregory.greenman@intel.com>
Subject: [PATCH 12/14] wifi: iwlwifi: remove dead code in iwl_dump_ini_imr_get_size()
Date: Wed, 31 May 2023 19:50:04 +0300 [thread overview]
Message-ID: <20230531194630.58eec8d40729.Ifb7d64706eed45726db804f36e785283dff7adab@changeid> (raw)
In-Reply-To: <20230531165006.273284-1-gregory.greenman@intel.com>
From: Mukesh Sisodiya <mukesh.sisodiya@intel.com>
Remove the check for the IMR debug data size which
leads to dead code.
Signed-off-by: Mukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
---
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index d9faaae01abd..3180cabc0212 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -2031,7 +2031,6 @@ static u32
iwl_dump_ini_imr_get_size(struct iwl_fw_runtime *fwrt,
struct iwl_dump_ini_region_data *reg_data)
{
- u32 size = 0;
u32 ranges = 0;
u32 imr_enable = fwrt->trans->dbg.imr_data.imr_enable;
u32 imr_size = fwrt->trans->dbg.imr_data.imr_size;
@@ -2041,17 +2040,16 @@ iwl_dump_ini_imr_get_size(struct iwl_fw_runtime *fwrt,
IWL_DEBUG_INFO(fwrt,
"WRT: Invalid imr data enable: %d, imr_size: %d, sram_size: %d\n",
imr_enable, imr_size, sram_size);
- return size;
+ return 0;
}
- size = imr_size;
ranges = iwl_dump_ini_imr_ranges(fwrt, reg_data);
- if (!size && !ranges) {
- IWL_ERR(fwrt, "WRT: imr_size :=%d, ranges :=%d\n", size, ranges);
+ if (!ranges) {
+ IWL_ERR(fwrt, "WRT: ranges :=%d\n", ranges);
return 0;
}
- size += sizeof(struct iwl_fw_ini_error_dump) +
+ imr_size += sizeof(struct iwl_fw_ini_error_dump) +
ranges * sizeof(struct iwl_fw_ini_error_dump_range);
- return size;
+ return imr_size;
}
/**
--
2.38.1
next prev parent reply other threads:[~2023-05-31 16:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 16:49 [PATCH 00/14] wifi: iwlwifi: updates intended for v6.5 2023-05-31 gregory.greenman
2023-05-31 16:49 ` [PATCH 01/14] wifi: iwlwifi: fix Bz checksum start/result offset gregory.greenman
2023-05-31 16:49 ` [PATCH 02/14] wifi: iwlwifi: Add vendors to TAS approved list gregory.greenman
2023-05-31 16:49 ` [PATCH 03/14] wifi: iwlwifi: mvm: support injection rate control gregory.greenman
2023-05-31 16:49 ` [PATCH 04/14] wifi: iwlwifi: mvm: clarify EHT RU allocation bits gregory.greenman
2023-05-31 16:49 ` [PATCH 05/14] wifi: iwlwifi: acpi: add other Google OEMs to the ppag approved list gregory.greenman
2023-05-31 16:49 ` [PATCH 06/14] wifi: iwlwifi: do not log undefined DRAM buffers unnecessarily gregory.greenman
2023-05-31 16:49 ` [PATCH 07/14] wifi: iwlwifi: mvm: offload BTM response during D3 gregory.greenman
2023-05-31 16:50 ` [PATCH 08/14] wifi: iwlwifi: pcie: adjust Bz device timings gregory.greenman
2023-05-31 16:50 ` [PATCH 09/14] wifi: iwlwifi: mvm: FTM initiator MLO support gregory.greenman
2023-05-31 16:50 ` [PATCH 10/14] wifi: iwlwifi: mvm: tell firmware about per-STA MFP enablement gregory.greenman
2023-05-31 16:50 ` [PATCH 11/14] wifi: iwlwifi: Add Dell to ppag approved list gregory.greenman
2023-05-31 16:50 ` gregory.greenman [this message]
2023-05-31 16:50 ` [PATCH 13/14] wifi: iwlwifi: mvm: remove warning for beacon filtering error gregory.greenman
2023-05-31 16:50 ` [PATCH 14/14] wifi: iwlwifi: mvm: send time sync only if needed gregory.greenman
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=20230531194630.58eec8d40729.Ifb7d64706eed45726db804f36e785283dff7adab@changeid \
--to=gregory.greenman@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=mukesh.sisodiya@intel.com \
/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).