* [PATCH wireless] iwlwifi: fw: simplify the iwl_fw_dbg_collect_trig()
@ 2020-12-09 9:28 Zheng Yongjun
2020-12-09 9:45 ` Kalle Valo
0 siblings, 1 reply; 2+ messages in thread
From: Zheng Yongjun @ 2020-12-09 9:28 UTC (permalink / raw)
To: kvalo, linux-wireless, netdev, linux-kernel; +Cc: davem, kuba, Zheng Yongjun
Simplify the return expression.
Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
---
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index ab4a8b942c81..9393fcb62076 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -2558,7 +2558,7 @@ int iwl_fw_dbg_collect_trig(struct iwl_fw_runtime *fwrt,
struct iwl_fw_dbg_trigger_tlv *trigger,
const char *fmt, ...)
{
- int ret, len = 0;
+ int len = 0;
char buf[64];
if (iwl_trans_dbg_ini_valid(fwrt->trans))
@@ -2580,13 +2580,8 @@ int iwl_fw_dbg_collect_trig(struct iwl_fw_runtime *fwrt,
len = strlen(buf) + 1;
}
- ret = iwl_fw_dbg_collect(fwrt, le32_to_cpu(trigger->id), buf, len,
+ return iwl_fw_dbg_collect(fwrt, le32_to_cpu(trigger->id), buf, len,
trigger);
-
- if (ret)
- return ret;
-
- return 0;
}
IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect_trig);
--
2.22.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH wireless] iwlwifi: fw: simplify the iwl_fw_dbg_collect_trig()
2020-12-09 9:28 [PATCH wireless] iwlwifi: fw: simplify the iwl_fw_dbg_collect_trig() Zheng Yongjun
@ 2020-12-09 9:45 ` Kalle Valo
0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2020-12-09 9:45 UTC (permalink / raw)
To: Zheng Yongjun; +Cc: linux-wireless, netdev, linux-kernel, davem, kuba
Zheng Yongjun <zhengyongjun3@huawei.com> writes:
> Simplify the return expression.
>
> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
> ---
> drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
> index ab4a8b942c81..9393fcb62076 100644
> --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
> +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
> @@ -2558,7 +2558,7 @@ int iwl_fw_dbg_collect_trig(struct iwl_fw_runtime *fwrt,
> struct iwl_fw_dbg_trigger_tlv *trigger,
> const char *fmt, ...)
> {
> - int ret, len = 0;
> + int len = 0;
> char buf[64];
>
> if (iwl_trans_dbg_ini_valid(fwrt->trans))
> @@ -2580,13 +2580,8 @@ int iwl_fw_dbg_collect_trig(struct iwl_fw_runtime *fwrt,
> len = strlen(buf) + 1;
> }
>
> - ret = iwl_fw_dbg_collect(fwrt, le32_to_cpu(trigger->id), buf, len,
> + return iwl_fw_dbg_collect(fwrt, le32_to_cpu(trigger->id), buf, len,
> trigger);
> -
> - if (ret)
> - return ret;
> -
> - return 0;
> }
> IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect_trig);
Up to Luca of course, but I prefer the original style.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-09 9:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-09 9:28 [PATCH wireless] iwlwifi: fw: simplify the iwl_fw_dbg_collect_trig() Zheng Yongjun
2020-12-09 9:45 ` Kalle Valo
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).