From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B20522DFF29; Tue, 17 Jun 2025 16:10:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750176620; cv=none; b=ljdaWyJ91CO29iGZArngxbuIOHk9gzQfvEDJC+d9HAbpfuBFyA6lG558Gizn8m3zG9dVxsgZPNk88jqSg50LUOXbRm2A0qFTBazxtD1noRt19DGxZf04404sFuUQF2ZPKzy/chomIZrMUOUZUxdeaMhXKyMJbUo7JONpYTnz3WU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750176620; c=relaxed/simple; bh=o9Z5LHqsEqcGWoO/9fXe5jm6uC8roHd1wCjHF6ipqSw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Pv8FLotEu2lBIrrUb/MMGQzZzd+Sqayks4Tn4fxUtICzI4fYShCR7iroKSmZIauV/eyBEnB2JWes0fs7KGAzzD0/UIyuikK2RLD5ZUjRLPkOnHyphF1FW/iShbRH8vVIKaCspvweb9iMoHrXRcJdYmrtNQ/C9mJNxEMYIktzhV0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IwLqG/NW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IwLqG/NW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41EE7C4CEE3; Tue, 17 Jun 2025 16:10:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750176620; bh=o9Z5LHqsEqcGWoO/9fXe5jm6uC8roHd1wCjHF6ipqSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IwLqG/NWwW+CiHRjPylG4kxunBQ46cvmsFDMXsbbtlvowu3ECx22AR3lqhLj10V5P XXlEoM6ScIKDuDTZ4r7nla+KtdnKtUZ/52BwPRhdSUn6cqe5TQxZZWxjoUsGZdJyCQ IFNtse30YoI/D3DzE5a/ZHY11tlYSpQsSmaGiT08= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jeff Johnson , Easwar Hariharan , Alexander Gordeev , Andrew Lunn , Anna-Maria Behnsen , Catalin Marinas , Christian Borntraeger , Christophe Leroy , Daniel Mack , David Airlie , "David S. Miller" , Dick Kennedy , Eric Dumazet , Florian Fainelli , Haojian Zhuang , Heiko Carstens , Ilya Dryomov , Jack Wang , Jakub Kicinski , James Bottomley , James Smart , Jaroslav Kysela , Jeff Johnson , Jens Axboe , Jeroen de Borst , Jiri Kosina , Joe Lawrence , Johan Hedberg , Josh Poimboeuf , Jozsef Kadlecsik , Julia Lawall , Kalle Valo , Louis Peens , Lucas De Marchi , Luiz Augusto von Dentz , Maarten Lankhorst , Madhavan Srinivasan , Marcel Holtmann , "Martin K. Petersen" , Maxime Ripard , Michael Ellerman , Miroslav Benes , Naveen N Rao , Nicholas Piggin , Nicolas Palix , Oded Gabbay , Ofir Bitton , Pablo Neira Ayuso , Paolo Abeni , Petr Mladek , Praveen Kaligineedi , Ray Jui , Robert Jarzmik , Rodrigo Vivi , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Russell King , Scott Branden , Shailend Chand , Simona Vetter , Simon Horman , Sven Schnelle , Takashi Iwai , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Thomas Zimmermann , Vasily Gorbik , Xiubo Li , Andrew Morton , Sasha Levin Subject: [PATCH 6.6 298/356] wifi: ath11k: convert timeouts to secs_to_jiffies() Date: Tue, 17 Jun 2025 17:26:53 +0200 Message-ID: <20250617152350.164504822@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152338.212798615@linuxfoundation.org> References: <20250617152338.212798615@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Easwar Hariharan [ 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-ddfefd7e9f2a@linux.microsoft.com Acked-by: Jeff Johnson Signed-off-by: Easwar Hariharan Cc: Alexander Gordeev Cc: Andrew Lunn Cc: Anna-Maria Behnsen Cc: Catalin Marinas Cc: Christian Borntraeger Cc: Christophe Leroy Cc: Daniel Mack Cc: David Airlie Cc: David S. Miller Cc: Dick Kennedy Cc: Eric Dumazet Cc: Florian Fainelli Cc: Greg Kroah-Hartman Cc: Haojian Zhuang Cc: Heiko Carstens Cc: Ilya Dryomov Cc: Jack Wang Cc: Jakub Kicinski Cc: James Bottomley Cc: James Smart Cc: Jaroslav Kysela Cc: Jeff Johnson Cc: Jens Axboe Cc: Jeroen de Borst Cc: Jiri Kosina Cc: Joe Lawrence Cc: Johan Hedberg Cc: Josh Poimboeuf Cc: Jozsef Kadlecsik Cc: Julia Lawall Cc: Kalle Valo Cc: Louis Peens Cc: Lucas De Marchi Cc: Luiz Augusto von Dentz Cc: Maarten Lankhorst Cc: Madhavan Srinivasan Cc: Marcel Holtmann Cc: Martin K. Petersen Cc: Maxime Ripard Cc: Michael Ellerman Cc: Miroslav Benes Cc: Naveen N Rao Cc: Nicholas Piggin Cc: Nicolas Palix Cc: Oded Gabbay Cc: Ofir Bitton Cc: Pablo Neira Ayuso Cc: Paolo Abeni Cc: Petr Mladek Cc: Praveen Kaligineedi Cc: Ray Jui Cc: Robert Jarzmik Cc: Rodrigo Vivi Cc: Roger Pau Monné Cc: Russell King Cc: Scott Branden Cc: Shailend Chand Cc: Simona Vetter Cc: Simon Horman Cc: Sven Schnelle Cc: Takashi Iwai Cc: Thomas Hellström Cc: Thomas Zimmermann Cc: Vasily Gorbik Cc: Xiubo Li Signed-off-by: Andrew Morton Stable-dep-of: 9f6e82d11bb9 ("wifi: ath11k: avoid burning CPU in ath11k_debugfs_fw_stats_request()") Signed-off-by: Sasha Levin --- 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); -- 2.39.5