6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Easwar Hariharan eahariha@linux.microsoft.com
[ Upstream commit b29425972c5234a59b6fb634125420ed74266377 ]
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)
Link: https://lkml.kernel.org/r/20241210-converge-secs-to-jiffies-v3-14-ddfefd7e9f... Acked-by: Jeff Johnson quic_jjohnson@quicinc.com Signed-off-by: Easwar Hariharan eahariha@linux.microsoft.com Cc: Alexander Gordeev agordeev@linux.ibm.com Cc: Andrew Lunn andrew+netdev@lunn.ch Cc: Anna-Maria Behnsen anna-maria@linutronix.de Cc: Catalin Marinas catalin.marinas@arm.com Cc: Christian Borntraeger borntraeger@linux.ibm.com Cc: Christophe Leroy christophe.leroy@csgroup.eu Cc: Daniel Mack daniel@zonque.org Cc: David Airlie airlied@gmail.com Cc: David S. Miller davem@davemloft.net Cc: Dick Kennedy dick.kennedy@broadcom.com Cc: Eric Dumazet edumazet@google.com Cc: Florian Fainelli florian.fainelli@broadcom.com Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org Cc: Haojian Zhuang haojian.zhuang@gmail.com Cc: Heiko Carstens hca@linux.ibm.com Cc: Ilya Dryomov idryomov@gmail.com Cc: Jack Wang jinpu.wang@cloud.ionos.com Cc: Jakub Kicinski kuba@kernel.org Cc: James Bottomley James.Bottomley@HansenPartnership.com Cc: James Smart james.smart@broadcom.com Cc: Jaroslav Kysela perex@perex.cz Cc: Jeff Johnson jjohnson@kernel.org Cc: Jens Axboe axboe@kernel.dk Cc: Jeroen de Borst jeroendb@google.com Cc: Jiri Kosina jikos@kernel.org Cc: Joe Lawrence joe.lawrence@redhat.com Cc: Johan Hedberg johan.hedberg@gmail.com Cc: Josh Poimboeuf jpoimboe@kernel.org Cc: Jozsef Kadlecsik kadlec@netfilter.org Cc: Julia Lawall julia.lawall@inria.fr Cc: Kalle Valo kvalo@kernel.org Cc: Louis Peens louis.peens@corigine.com Cc: Lucas De Marchi lucas.demarchi@intel.com Cc: Luiz Augusto von Dentz luiz.dentz@gmail.com Cc: Maarten Lankhorst maarten.lankhorst@linux.intel.com Cc: Madhavan Srinivasan maddy@linux.ibm.com Cc: Marcel Holtmann marcel@holtmann.org Cc: Martin K. Petersen martin.petersen@oracle.com Cc: Maxime Ripard mripard@kernel.org Cc: Michael Ellerman mpe@ellerman.id.au Cc: Miroslav Benes mbenes@suse.cz Cc: Naveen N Rao naveen@kernel.org Cc: Nicholas Piggin npiggin@gmail.com Cc: Nicolas Palix nicolas.palix@imag.fr Cc: Oded Gabbay ogabbay@kernel.org Cc: Ofir Bitton obitton@habana.ai Cc: Pablo Neira Ayuso pablo@netfilter.org Cc: Paolo Abeni pabeni@redhat.com Cc: Petr Mladek pmladek@suse.com Cc: Praveen Kaligineedi pkaligineedi@google.com Cc: Ray Jui rjui@broadcom.com Cc: Robert Jarzmik robert.jarzmik@free.fr Cc: Rodrigo Vivi rodrigo.vivi@intel.com Cc: Roger Pau Monné roger.pau@citrix.com Cc: Russell King linux@armlinux.org.uk Cc: Scott Branden sbranden@broadcom.com Cc: Shailend Chand shailend@google.com Cc: Simona Vetter simona@ffwll.ch Cc: Simon Horman horms@kernel.org Cc: Sven Schnelle svens@linux.ibm.com Cc: Takashi Iwai tiwai@suse.com Cc: Thomas Hellström thomas.hellstrom@linux.intel.com Cc: Thomas Zimmermann tzimmermann@suse.de Cc: Vasily Gorbik gor@linux.ibm.com Cc: Xiubo Li xiubli@redhat.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Stable-dep-of: 9f6e82d11bb9 ("wifi: ath11k: avoid burning CPU in ath11k_debugfs_fw_stats_request()") Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c index 34aa04d27a1d7..a8bd944f76d92 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);