From patchwork Mon Oct 28 19:11:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 839406 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1489E1E04B3; Mon, 28 Oct 2024 19:11:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730142678; cv=none; b=TpAAXoqRJ/LEFu3ia/e0MDo145O/g07nMejpH+kuUhHJNUkuadTyAdCfKmv5DNSj5quTGeGejhfreKZ0TCjjWalgZCvh9MjwHf5bY7DjMML+JD5efAZZMrBm9B5hPqx1xCfMTOLSMFfFHf1x0mQENGjZwfuOE+aydeXvpNLt5II= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730142678; c=relaxed/simple; bh=7LdAF0atlIAeFjBKeUA5igpYjoWw7yVXLZJP3z7keko=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BU2MVFXcbRBe60iTY9brr8xi4e1nP1zU2YvEdStII/mlQ1S732T1wt+Bt6jH4yoy94AC7Pt5sC6Damrk0pLaGcNiHRInWSl8FvnmdHLfRWvlaPtvpAt5hdD8bYF9I51AlQzXqYdme8aDma0cd6lEnyMipuXO2aAU80e+haa0jtc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=Ojey8mCB; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="Ojey8mCB" Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id 3D169211F5ED; Mon, 28 Oct 2024 12:11:15 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 3D169211F5ED DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1730142675; bh=5IWioSIiUCrOJ9tFj6klW/8OTmQbfbizRlqfO9DDr5M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ojey8mCBRWpXrGjlmKn9M+N7K2iKvM2oQmqqZKfgrHu0ilrzYoK4Belk+0tYQaVUe jCNc8NI8jwXcB37RVM/FKlvEDnA5vww9hdVkwrrRKonL5LnnBl6+mVSeTAjF8X+gWM MggGqcDeY2scjZLeXdNgffWYsar/cRk+GpC7Jsnw= From: Easwar Hariharan Date: Mon, 28 Oct 2024 19:11:02 +0000 Subject: [PATCH v2 1/2] jiffies: Define secs_to_jiffies() Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241028-open-coded-timeouts-v2-1-c7294bb845a1@linux.microsoft.com> References: <20241028-open-coded-timeouts-v2-0-c7294bb845a1@linux.microsoft.com> In-Reply-To: <20241028-open-coded-timeouts-v2-0-c7294bb845a1@linux.microsoft.com> To: "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , linux-hyperv@vger.kernel.org, Anna-Maria Behnsen , Thomas Gleixner , Geert Uytterhoeven , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Michael Kelley , Easwar Hariharan X-Mailer: b4 0.14.1 secs_to_jiffies() is defined in hci_event.c and cannot be reused by other call sites. Hoist it into the core code to allow conversion of the ~1150 usages of msecs_to_jiffies() that either: - use a multiplier value of 1000 or equivalently MSEC_PER_SEC, or - have timeouts that are denominated in seconds (i.e. end in 000) This will also allow conversion of yet more sites that use (sec * HZ) directly, and improve their readability. TO: "K. Y. Srinivasan" TO: Haiyang Zhang TO: Wei Liu TO: Dexuan Cui TO: linux-hyperv@vger.kernel.org TO: Anna-Maria Behnsen TO: Thomas Gleixner TO: Geert Uytterhoeven TO: Marcel Holtmann TO: Johan Hedberg TO: Luiz Augusto von Dentz TO: linux-bluetooth@vger.kernel.org TO: linux-kernel@vger.kernel.org Suggested-by: Michael Kelley Signed-off-by: Easwar Hariharan --- include/linux/jiffies.h | 2 ++ net/bluetooth/hci_event.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index 1220f0fbe5bf..e5256bb5f851 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -526,6 +526,8 @@ static __always_inline unsigned long msecs_to_jiffies(const unsigned int m) } } +#define secs_to_jiffies(_secs) ((_secs) * HZ) + extern unsigned long __usecs_to_jiffies(const unsigned int u); #if !(USEC_PER_SEC % HZ) static inline unsigned long _usecs_to_jiffies(const unsigned int u) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 0bbad90ddd6f..7b35c58bbbeb 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -42,8 +42,6 @@ #define ZERO_KEY "\x00\x00\x00\x00\x00\x00\x00\x00" \ "\x00\x00\x00\x00\x00\x00\x00\x00" -#define secs_to_jiffies(_secs) msecs_to_jiffies((_secs) * 1000) - /* Handle HCI Event packets */ static void *hci_ev_skb_pull(struct hci_dev *hdev, struct sk_buff *skb,