| Message ID | 20241210-converge-secs-to-jiffies-v3-14-ddfefd7e9f2a@linux.microsoft.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | Converge on using secs_to_jiffies() | expand |
Easwar Hariharan <eahariha@linux.microsoft.com> writes: > Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced > secs_to_jiffies(). As the value here is a multiple of 1000, use > secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication. > > This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with > the following Coccinelle rules: > > @@ constant C; @@ > > - msecs_to_jiffies(C * 1000) > + secs_to_jiffies(C) > > @@ constant C; @@ > > - msecs_to_jiffies(C * MSEC_PER_SEC) > + secs_to_jiffies(C) > > Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> > Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> > --- > drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I assume we can take this to our ath.git tree, please let us know if that's not the case.
Kalle Valo <kvalo@kernel.org> writes: > Easwar Hariharan <eahariha@linux.microsoft.com> writes: > >> Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced >> secs_to_jiffies(). As the value here is a multiple of 1000, use >> secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication. >> >> This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with >> the following Coccinelle rules: >> >> @@ constant C; @@ >> >> - msecs_to_jiffies(C * 1000) >> + secs_to_jiffies(C) >> >> @@ constant C; @@ >> >> - msecs_to_jiffies(C * MSEC_PER_SEC) >> + secs_to_jiffies(C) >> >> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> >> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> >> --- >> drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > I assume we can take this to our ath.git tree, please let us know if > that's not the case. Nevermind, I now saw the discussion in the cover letter and assume that this patch will be sent separately.
diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c index 57281a135dd7fa6b8610636f47873c8bba21053c..bf192529e3fe26a91e72105a77b4c6f849b905ec 100644 --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c @@ -178,7 +178,7 @@ static int ath11k_debugfs_fw_stats_request(struct ath11k *ar, * received 'update stats' event, we keep a 3 seconds timeout in case, * fw_stats_done is not marked yet */ - timeout = jiffies + msecs_to_jiffies(3 * 1000); + timeout = jiffies + secs_to_jiffies(3); ath11k_debugfs_fw_stats_reset(ar);
Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced secs_to_jiffies(). As the value here is a multiple of 1000, use secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication. This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with the following Coccinelle rules: @@ constant C; @@ - msecs_to_jiffies(C * 1000) + secs_to_jiffies(C) @@ constant C; @@ - msecs_to_jiffies(C * MSEC_PER_SEC) + secs_to_jiffies(C) Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> --- drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)