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:     "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Wang Qing <wangqing@vivo.com>
Subject: [PATCH] net: ethernet: sun: use time_is_before_jiffies() instead of open coding it
Date:   Sun, 27 Feb 2022 19:13:15 -0800
Message-Id: <1646017995-61083-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?SA+2LrXJBnoHDykQr4rux5Xk5lzF9Xj1F44kWK7UxdACefv01yjndMXxIkwA?=
 =?us-ascii?Q?hKFAlxT6ZpmMTTn+BFmvDINolQEDvaj2cHY1nDeETNhQVqRuA/NDZsE47GgN?=
 =?us-ascii?Q?ZXZF2L63hQGRL0Exq0wsO1io1uDLxjn6UfnXDyzS9Yz0n6BSpUkGAhaGtDmG?=
 =?us-ascii?Q?CSG8Pyu6OJNmNCRloxuxKec9U5Prd7lxttIGnJ9w+j9HDf3C/M0x+6NxQQrp?=
 =?us-ascii?Q?wKDLByb03YwuL+ACPks0g4iyjSbLMeL7npQ5RdNEshHG8rlGvhI4bhfbD9qN?=
 =?us-ascii?Q?5btHesZ9qGZG7EgcHG3mTk616FvokbuwvxvRJ1hzz7wQKhscaF7XCmvNsCTR?=
 =?us-ascii?Q?Z0hkc7W0hDWTx4D+duosyGQmaXhsSMQIpO+UcOYErkyL+BpEcF9luvCv17L5?=
 =?us-ascii?Q?R8ETrsT2WPQwBDIw5BZxXzEPH0u6Qa5jeme5l1awb7ko2fp6NGMNLRcDQXIM?=
 =?us-ascii?Q?lv1wpuTzugI6DOxH2OKVRtRLzuCPG6jB5AKf3bp5COUHC0SuZKZG6fL4t8dg?=
 =?us-ascii?Q?ejIBt6Srclr1VF9xr5uW/l5HXuNZdc26Z65fyQxMQ5yd13kxZxCiS1ItyMuk?=
 =?us-ascii?Q?XPj8XKr/++WQBMtV9C7tzMnnyAHiAK+sEuFi4odX5AScuANcP6woId8gptg7?=
 =?us-ascii?Q?nO/H365Dp6p9cwTiQ3F6Z8KB/qfQoJ10olfcJ/cuzGMbFKExeG+mhwt6+pmG?=
 =?us-ascii?Q?l8ob6iri1atkj8bW6QNalO5qqbdLOCAvSJjTne4yH2xB3qt0ZT4dskiLCWWe?=
 =?us-ascii?Q?lid3KNuJ5xDxpbJAPpuacfSddnfbC6J7Oj0fS0nW1UU/IiVOa56/jZ/4H4pP?=
 =?us-ascii?Q?cbnWS0OkI8CD9/180WtRYhapYKHVxYPXi8NF6FPpLWszprmj+ZA0gr9P/vV1?=
 =?us-ascii?Q?XHq/xw9V+uYMMfWGmxUI4B/RKIuOStkWbAZmEOup+PFdZ/5CNEFsdedgHp2Z?=
 =?us-ascii?Q?o7fBql5VJlqbVMtKXNzqWQ9EEFkymyiBuNgZaOI3bGBNWPSByKHUk0hE9szN?=
 =?us-ascii?Q?wsT7+JGA8QYmLuJ4rkPYJ62bs9baOVJTkEl3ZJWcvW3QFW0uDddT4Jz4YbsW?=
 =?us-ascii?Q?xvpb3xSfKZviX6arR7W2Rv+ISOPFsto2wYdzVZ8IQYpqX7G2zBbUNr6aUvQ7?=
 =?us-ascii?Q?y2i84ZEz/NRgM/i5oxrP2uakXKr9GWiLSSr7R0CSBmmypYqQxYQvvDndXbqF?=
 =?us-ascii?Q?j5U/sraA/ZyMPvgBDWO9qh1gGuLGElKdoMRnoMNAsK4KsMsGk+G9F1ZSkgWY?=
 =?us-ascii?Q?D2XKsIN4FVPnfZNzcm7br8cPtC2Jc7x52stKu1g1VIfMqBhs6yVkFVg1fwxW?=
 =?us-ascii?Q?e98e0Y42cHYU6nbT9Yo6DEEVomLwlS2krv3J/3nziSfqc+QGhG0MF18oVgCI?=
 =?us-ascii?Q?2aXpp4NhCHZFtloNi6II+Enz/yNTi5FlzmqAZXG2svfR5FzeIOtwTquZ/iYJ?=
 =?us-ascii?Q?qXaYn4tSfdQPVb7rnKSfLu5aWLehelONMtpoDJZ0iko6bPUNSe6U+vzak0Je?=
 =?us-ascii?Q?/3hwEVuCCf+qHNFzhrCYudzi8wbLbhhAVRJSAM9aL2lq61D8pDfhSPy0ZeuJ?=
 =?us-ascii?Q?d45ckefnbm1tQFa2edvv7eZtxVhNCUlaxTwkPt8qu69hUc7+YHQe3ArfKEpB?=
 =?us-ascii?Q?BkK03ei1Kj1sj9B9Hfim9xg=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d2c2631d-8105-4d97-952b-08d9fa68483b
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:24.8167
 (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: 5hTKsfN53YXPFOkZn3/U1CK9TrQv4e3XvFMa5FYpvbgQuvl28ohHSk4g2t9JI/WFHRfVE4WT2WWl/5R0UmPTqw==
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/ethernet/sun/cassini.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index dba9f12..947a76a
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -88,6 +88,7 @@
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <linux/uaccess.h>
+#include <linux/jiffies.h>
 
 #define cas_page_map(x)      kmap_atomic((x))
 #define cas_page_unmap(x)    kunmap_atomic((x))
@@ -4063,8 +4064,8 @@ static void cas_link_timer(struct timer_list *t)
 
 	if (link_transition_timeout != 0 &&
 	    cp->link_transition_jiffies_valid &&
-	    ((jiffies - cp->link_transition_jiffies) >
-	      (link_transition_timeout))) {
+	    time_is_before_jiffies(cp->link_transition_jiffies +
+	      link_transition_timeout)) {
 		/* One-second counter so link-down workaround doesn't
 		 * cause resets to occur so fast as to fool the switch
 		 * into thinking the link is down.
-- 
2.7.4