| Message ID | 20241212-netdev-converge-secs-to-jiffies-v4-2-6dac97a6d6ab@linux.microsoft.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Converge on using secs_to_jiffies() in netdev | expand |
On 12/12/2024 9:33 AM, Easwar Hariharan wrote: > 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. > > > something is wrong with your patch since it introduces a blank line after each line. Also if you want the ath11k patch to be taken separately, it goes through the ath tree, not the net tree. /jeff
On 12/12/2024 9:51 AM, Jeff Johnson wrote: > On 12/12/2024 9:33 AM, Easwar Hariharan wrote: >> 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. >> >> >> > > something is wrong with your patch since it introduces a blank line after each > line. > This is some sort of weird interaction between b4 and git send-email. I used git send-email to send the patches after writing them out with b4 send so as to edit "net-next" into the subject line. It's good to know to not mix the tools in the future. I can resend from the branch with git send-email directly to avoid this if preferred. > Also if you want the ath11k patch to be taken separately, it goes through the > ath tree, not the net tree. > > /jeff > I don't have a preference on being taken separately, whatever approach works best is good with me. Thanks, Easwar
On 12/12/2024 11:17 AM, Easwar Hariharan wrote: > On 12/12/2024 9:51 AM, Jeff Johnson wrote: >> On 12/12/2024 9:33 AM, Easwar Hariharan wrote: >>> 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. >>> >>> >>> >> >> something is wrong with your patch since it introduces a blank line after each >> line. >> > > This is some sort of weird interaction between b4 and git send-email. I > used git send-email to send the patches after writing them out with b4 > send so as to edit "net-next" into the subject line. It's good to know > to not mix the tools in the future. > > I can resend from the branch with git send-email directly to avoid this > if preferred. > >> Also if you want the ath11k patch to be taken separately, it goes through the >> ath tree, not the net tree. >> >> /jeff >> > > I don't have a preference on being taken separately, whatever approach > works best is good with me. Andrew has this in his mm tree, so let's just have it come from there: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git/commit/?h=mm-everything&id=b3b550379dd1f0b65fac207c9c4d0eb5ed84775e
On 12/12/2024 11:17 AM, Easwar Hariharan wrote: > This is some sort of weird interaction between b4 and git send-email. I > used git send-email to send the patches after writing them out with b4 > send so as to edit "net-next" into the subject line. It's good to know > to not mix the tools in the future. > > I can resend from the branch with git send-email directly to avoid this > if preferred. Note that if you have a recent version, b4 prep --set-prefixes can add the tags to the subject (and keep track of them in the cover letter metadata)
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(-)