From patchwork Fri Nov 15 21:26:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13877126 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5008BD68BE5 for ; Fri, 15 Nov 2024 21:26:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AAF608D0009; Fri, 15 Nov 2024 16:26:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 977E58D0008; Fri, 15 Nov 2024 16:26:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68E138D0007; Fri, 15 Nov 2024 16:26:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 469608D0001 for ; Fri, 15 Nov 2024 16:26:46 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id CA89980324 for ; Fri, 15 Nov 2024 21:26:45 +0000 (UTC) X-FDA: 82789613088.04.56953E6 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf13.hostedemail.com (Postfix) with ESMTP id D89BB2000D for ; Fri, 15 Nov 2024 21:25:56 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=iVvLyPnz; spf=pass (imf13.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731705766; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=2qNmVTIUPIQHjxG6U+oz3oOJorUpDTvltiEua1kgDGM=; b=xpf2XclFyjGIQ3kfNdFpiec7c2fIOCHvhMhBf9Wu2KManOR0vG6xFjd0BOf84n2sNzmTS0 WZ3Uf7rUVcxzuTlK97a0l1C3JCRoOWLFOtP4/ScCe75oBZ3NIDxXsYDblA/P5eTKFKU/76 bCszl76pS6KbHAp3oeD6IFyJUny0350= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=iVvLyPnz; spf=pass (imf13.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731705766; a=rsa-sha256; cv=none; b=pSCCjVEmRU4ir9PJXf4nkrFSt/qF2OHYmUJuKXKGsz3KlalC/Srs75LjEQfUi/xnwpyrjl X2wJIGd7oC784ht9tiC5JDP9Zyh4Jg/C+7CAB6pFh7VDhbS5FAr10g7WV1JJrsi83AS2Vo zSx4KbbPS/tg4hLDsTKWCm/XFriDgXk= Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id CEC70206BCF9; Fri, 15 Nov 2024 13:26:41 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com CEC70206BCF9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1731706002; bh=2qNmVTIUPIQHjxG6U+oz3oOJorUpDTvltiEua1kgDGM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=iVvLyPnzqMDnIVqCr8TaID7h6/EcvZ4uGITdugla/Mpc21N0a+zSOXosYGRpfd2vu d1MyMoy9U+Z9sd1VeqqtG/myJ7CKMnsPLRLQ8NuKd0YjVEIqU9hZB6KsELpQ9xGs8R v7zo22n2+S5uyzdobRgvEalMR5SyEYAxTB4IIGU8= From: Easwar Hariharan Date: Fri, 15 Nov 2024 21:26:21 +0000 Subject: [PATCH v2 04/21] s390: kernel: Convert timeouts to use secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241115-converge-secs-to-jiffies-v2-4-911fb7595e79@linux.microsoft.com> References: <20241115-converge-secs-to-jiffies-v2-0-911fb7595e79@linux.microsoft.com> In-Reply-To: <20241115-converge-secs-to-jiffies-v2-0-911fb7595e79@linux.microsoft.com> To: Pablo Neira Ayuso , Jozsef Kadlecsik , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Julia Lawall , Nicolas Palix , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Russell King , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Ofir Bitton , Oded Gabbay , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6?= =?utf-8?q?m?= , Rodrigo Vivi , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jeroen de Borst , Praveen Kaligineedi , Shailend Chand , Andrew Lunn , James Smart , Dick Kennedy , "James E.J. Bottomley" , "Martin K. Petersen" , =?utf-8?q?Roger_Pau_Mon?= =?utf-8?q?n=C3=A9?= , Jens Axboe , Kalle Valo , Jeff Johnson , Catalin Marinas , Andrew Morton , Jack Wang , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Greg Kroah-Hartman , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Xiubo Li , Ilya Dryomov , Josh Poimboeuf , Jiri Kosina , Miroslav Benes , Petr Mladek , Joe Lawrence , Jaroslav Kysela , Takashi Iwai , Lucas Stach , Russell King , Christian Gmeiner , Louis Peens , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Madhavan Srinivasan Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, cocci@inria.fr, linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-scsi@vger.kernel.org, xen-devel@lists.xenproject.org, linux-block@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-mm@kvack.org, linux-bluetooth@vger.kernel.org, linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, ceph-devel@vger.kernel.org, live-patching@vger.kernel.org, linux-sound@vger.kernel.org, etnaviv@lists.freedesktop.org, oss-drivers@corigine.com, linuxppc-dev@lists.ozlabs.org, Anna-Maria Behnsen , Easwar Hariharan X-Mailer: b4 0.14.2 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: D89BB2000D X-Stat-Signature: xq463nryp7foi1htwikf859kn98kaf1n X-Rspam-User: X-HE-Tag: 1731705956-899084 X-HE-Meta: U2FsdGVkX1+NCYXyHCWwrRe1aSrDg++/ICAEoyipzD6ByURHt2ig16lAUG2YqlWn5GTrldTl177Vg3uHTpAxo4pG+CGx+9tzMMymB9zS5QUvk3kzvFMJoUNN5H/J5QQzNIrPP7BlILF4Zr6rWJEKCEK3M9GsuVTh3zyq02O4Fs/w9V3MjP+ys87RWFCA+QlZJ0xwmQHMrmhwdKuWTrRluacndE7+jK7ZDcTAMKGacRvCPJWd035E53KTiFxP9mt492ZGSLzMAqEPJa8raSLwkEZFIfDgQYSxHRKuw92AfHANYIOfTVzU21SRd0k7j/ubNXdyIK4vliOoMqqXf3pJVb/k1OV9UIFXRent/eSNMr7ot9rwYsajzOBm35aCpTv0ojCFmNzQ4dJBmR1VyCPGNltiO1z4EFZDp4qLDMigO7ubMCN3zm8mLyJzJHmPEdB721hv28yl6U4+rgOIDoqPTLQv+6xQ+UXJGbA8uUUf0fbZvznMqqh+HiCAAlwxIxskiDMDNW6JQWCmrDEEDEHpBJCpKHK+T+xjwanLtDaUpxpF6ZDQANoEybvWNxNWSW1/mFjVte8czZnvXOpKVypV/bjnimmVJWcj/9G/HiAeN+xLlNLeeo8EFe+HsLjncHKDSGk65940CXUrSknvczJoP2Vp0WNheWiTwACyCI82QzYYMA8lj4o6SdGmZPvXZpzfSnZyePaCT2lSv51pJCQuBEYjbX9DocEA/6UXoyAX/0N0gOVYVQcd3BSI4g2LkjswSLYg3ARWwnchG34BfbAcB4O0hd1TIJWUrf8fNlQ9gHmZT2GmPt7TisFCGvw1IM1cHe6h1eR6GjZWt+J5yyZ0tBdqtbss5h2bQz2t0H4CpcSPd4pIgFLvATKE6DSoU4O0xmMyLjOjT/jGSUT2OO1dX0vaxcwTlMG9HNrOcqoRQxWIzQtEKNjYZNpXj5m3TB7wryBkE8iUkFhnQeblXja Gq9NQfaU 2kD9yEfs+eSX+TYFom9BlIlj6aLWS1ygiKVwCGkn5GNkuodPQM9T77UVYvx62YAcxzxn/P6UwXsD8kQYjcUHTI4BSKbF07iGNLCv7fSMk1obkZoS+aBU06F6YlCnBrcUHER8LheU1pl7yW64wDbvDXQgsQuuAUMeibKV/37FRyAFd5b9glka3rf+BL5Ox0fy22Y/uzjpSt7C7xUYBJpsoyQMOReK+fr/qswb0vE4mSPcBCJEZiEcW2CdTEh3Ka43k0kWxpqmptu1eURWXwA7uu5vxH/EVaHFMx7+DhI2KtklkRuxuHmwCEWMPozjxlNT5uPq6El+3TqHaNFBz4ZVSS1qOxDqB0mlhLxgvEWOzg8l/KTNh/24dSUWErJUWX2ECLWTptDAgAOnlCh3HMQHeLrdyOBH5jdSakbO4nT8urVrq8tMNMOnEH2IIh8HJT/medwMM X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Changes made 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) Signed-off-by: Easwar Hariharan --- arch/s390/kernel/lgr.c | 3 ++- arch/s390/kernel/time.c | 4 ++-- arch/s390/kernel/topology.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c index 6652e54cf3db9fbdd8cfb06f8a0dc1d4c05ae7d7..68021cb38574b122bbe3d9f70e9168305360017b 100644 --- a/arch/s390/kernel/lgr.c +++ b/arch/s390/kernel/lgr.c @@ -166,7 +166,8 @@ static struct timer_list lgr_timer; */ static void lgr_timer_set(void) { - mod_timer(&lgr_timer, jiffies + msecs_to_jiffies(LGR_TIMER_INTERVAL_SECS * MSEC_PER_SEC)); + mod_timer(&lgr_timer, + jiffies + secs_to_jiffies(LGR_TIMER_INTERVAL_SECS)); } /* diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index b713effe057967623f64da8297314fcc42ff1af2..e28c61d39d27c6e89f490e779ff674ba2fe21d3e 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -656,12 +656,12 @@ static void stp_check_leap(void) if (ret < 0) pr_err("failed to set leap second flags\n"); /* arm Timer to clear leap second flags */ - mod_timer(&stp_timer, jiffies + msecs_to_jiffies(14400 * MSEC_PER_SEC)); + mod_timer(&stp_timer, jiffies + secs_to_jiffies(14400)); } else { /* The day the leap second is scheduled for hasn't been reached. Retry * in one hour. */ - mod_timer(&stp_timer, jiffies + msecs_to_jiffies(3600 * MSEC_PER_SEC)); + mod_timer(&stp_timer, jiffies + secs_to_jiffies(3600)); } } diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 813e5da9a9737e05ec3ef85a495fe38cbb40c49b..99095ff3897c1b5337f7e2abcf10f3fe8219ad7c 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c @@ -370,7 +370,7 @@ static void set_topology_timer(void) if (atomic_add_unless(&topology_poll, -1, 0)) mod_timer(&topology_timer, jiffies + msecs_to_jiffies(100)); else - mod_timer(&topology_timer, jiffies + msecs_to_jiffies(60 * MSEC_PER_SEC)); + mod_timer(&topology_timer, jiffies + secs_to_jiffies(60)); } void topology_expect_change(void)