Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Qing Wang <wangqing@vivo.com>
To:     Joerg Reuter <jreuter@yaina.de>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>, linux-hams@vger.kernel.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Wang Qing <wangqing@vivo.com>
Subject: [PATCH] net: hamradio: use time_is_after_jiffies() instead of open coding it
Date:   Sun, 27 Feb 2022 19:13:31 -0800
Message-Id: <1646018012-61129-1-git-send-email-wangqing@vivo.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?J9FpyRlxz+ZQ++XxitCaF2ulbCyaEVyL18Due5NMwHu6O7ongRrueEMET9AU?=
 =?us-ascii?Q?qd1LzjJGURTq82GqtJm3l7Nf7EAkju+83J/cCHFb/p3AzEkt9EBTYPSHBi+2?=
 =?us-ascii?Q?P2JSu2Apg7OF70874wzhJyC6Hwvm7fSRtf9hR6CoPZ/j+Dm1OPJldlEZ1mXf?=
 =?us-ascii?Q?K6vM9DCCzCh2XjSNoSq46S4R+Ye9PLPjnYWjtqNxiiW/z1XnWvY5jhgy9Q3Z?=
 =?us-ascii?Q?tpIQb9zqU9sJmMmDp7qyCxpF6iFKXyFbMyrleKiyBzudHmvUN0qjsyPN9YIq?=
 =?us-ascii?Q?z3WjaPZnNPneJFW9pjDHoGn+9kNLLj0Y7kNMHUu7lBBSmWeBph2LmreRylHr?=
 =?us-ascii?Q?JBq1v7UjF6OKgTiYUYv3eN4DTXqh7coeiCH2LGCm6T+E/cbuRExC8ujq2Tbg?=
 =?us-ascii?Q?+I6ZbGL6Omj5enxhna9yJO4xZHDbSB99AcP5Jd7dt0sMA/ew4JYm7ApKmYFX?=
 =?us-ascii?Q?Zaxn/58JGt/yWu3VkpR2TnmeRq8weq06DaRYTyiUOLhuDnOk38Yej1q+dvne?=
 =?us-ascii?Q?AZOw8NNRmxHV7ZmVh5xkKSnsD3KEqQZugu9Das1CkrY1FEZ34HuESAnTilDI?=
 =?us-ascii?Q?af6s/67phiixkNqcOgefdsToEpYuSKjdQ8JSUN+Vedu3NDKrapS9+xACCa9n?=
 =?us-ascii?Q?4ym2xF6CBypLIwDPFyDOqBpSZEyK33wZH9rhmK2KMIbgGjChhdt+bD5pNa7e?=
 =?us-ascii?Q?T3h52cpbAQLlludBQH641KmPC7OebHMWCDgf9zf/sLhbB0hqegmgmnj1m1f+?=
 =?us-ascii?Q?dpnMDBozITYohBckawccXsgG/FbhpX/ZV2pxAXCrQVDkMGrCorDnSAoGyDfF?=
 =?us-ascii?Q?irH6D9pEUbOLjpMxAa5z2YgaxP5fAcGzwM84bUVfNda5xH2PlmDWPTWM5Zot?=
 =?us-ascii?Q?OQVu4gyVqoIStOLOL2MrtyobGxZWtPglaOyEE5reqCDEX270Jrq8wcpluV1z?=
 =?us-ascii?Q?5MK+tdm7sbENlgjm/IDoRaO91XjTmIqA+9ci6qHQLs3B+a+DhgUzkk8uvfPg?=
 =?us-ascii?Q?Pn2nnm9JQo7gnKhBYBNWTnGxgKsgPPKeCsBU8pcPSbA1wU1ILKi8eT9q6RWr?=
 =?us-ascii?Q?FjqRgPvpokNGkkqPhMLeO2/5lFLO/xLSI7MA3e8ZaFnWwRhYnK8MjQqJua9q?=
 =?us-ascii?Q?oUhW3CwbGU3UqVSpC5hNFNFC8jmz2MvgwnOA+JD4BQhWUQXIaLKcSi0dlH2T?=
 =?us-ascii?Q?Ehy5AR+1vzLh26uAIA4HeLURF/8SOXxB4YG15u8lL5TSVpXxwF5dLfPoDiQ3?=
 =?us-ascii?Q?SZcUp3BJNfqK91QBbiGngbD7gF0fGrkTd45RM4ssjitxZluaa4hK/mZ/4GfP?=
 =?us-ascii?Q?gL/AnsuE5xXH0BpGXIKF1zfyQu09FXZG+UHaBqx+pE5m6ZHHLJjp2XE4HZ+f?=
 =?us-ascii?Q?PTfsUmybnDupNyJ5ig+GAu0cfBH6/qLdVXuaDIU0T1yhr7+LtG57gVBcmyG4?=
 =?us-ascii?Q?oi6qvGuRKXZdPtreHyOthv0iJlP6kZToCg5ijvqfwlNHYWErF2w/2A17Z0XE?=
 =?us-ascii?Q?gYhuK4JvgEnub1xrnMc7KMy3otBUvqQLkZWx7the5sFc0RdCfSw/gguUz556?=
 =?us-ascii?Q?gN44Q3TaLULanR5M2Wvuww7pASJ8deSUGY2SnLj0Dlhrwn+Tq9wV07sKfMvD?=
 =?us-ascii?Q?1rfWiXrqDecdxdlKrSJ+pqk=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a6578132-ce84-4b08-f3c7-08d9fa685012
X-MS-Exchange-CrossTenant-AuthSource: SL2PR06MB3082.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2022 03:13:37.9097
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: FkVrEBN8JW6OyWy3wII0pX/3YL87vDYM/21GzBa/PhGgCD5gq2id3jpCUJrwmqNMPHe/k2Zs0tJ9L3OR3qVGHQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS2PR06MB2454
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Wang Qing <wangqing@vivo.com>

Use the helper function time_is_{before,after}_jiffies() to improve
code readability.

Signed-off-by: Wang Qing <wangqing@vivo.com>
---
 drivers/net/hamradio/dmascc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 7e52749..6e7d17a
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -28,6 +28,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <linux/uaccess.h>
+#include <linux/jiffies.h>
 #include <net/ax25.h>
 #include "z8530.h"
 
@@ -377,7 +378,7 @@ static int __init dmascc_init(void)
 		udelay(2000000 / TMR_0_HZ);
 
 		/* Timing loop */
-		while (jiffies - time < 13) {
+		while (time_is_after_jiffies(time + 13)) {
 			for (i = 0; i < hw[h].num_devs; i++)
 				if (base[i] && counting[i]) {
 					/* Read back Timer 1: latch; read LSB; read MSB */
@@ -525,7 +526,7 @@ static int __init setup_adapter(int card_base, int type, int n)
 
 	/* Wait and detect IRQ */
 	time = jiffies;
-	while (jiffies - time < 2 + HZ / TMR_0_HZ);
+	while (time_is_after_jiffies(time + 2 + HZ / TMR_0_HZ));
 	irq = probe_irq_off(irqs);
 
 	/* Clear pending interrupt, disable interrupts */
@@ -1353,7 +1354,7 @@ static void es_isr(struct scc_priv *priv)
 		/* Switch state */
 		write_scc(priv, R15, 0);
 		if (priv->tx_count &&
-		    (jiffies - priv->tx_start) < priv->param.txtimeout) {
+		    time_is_after_jiffies(priv->tx_start + priv->param.txtimeout) {
 			priv->state = TX_PAUSE;
 			start_timer(priv, priv->param.txpause, 0);
 		} else {
-- 
2.7.4