Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757158AbYCQJi7 (ORCPT ); Mon, 17 Mar 2008 05:38:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755962AbYCQJho (ORCPT ); Mon, 17 Mar 2008 05:37:44 -0400 Received: from ns2.uludag.org.tr ([193.140.100.220]:42591 "EHLO uludag.org.tr" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753217AbYCQJhT (ORCPT ); Mon, 17 Mar 2008 05:37:19 -0400 From: =?utf-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= To: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org, Andrew Morton Subject: [PATCH] drivers/net/ax88796.c: Use time_* macros Date: Mon, 17 Mar 2008 11:36:28 +0200 Message-Id: <1205746593-24820-6-git-send-email-caglar@pardus.org.tr> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1205746593-24820-5-git-send-email-caglar@pardus.org.tr> References: <> <1205746593-24820-1-git-send-email-caglar@pardus.org.tr> <1205746593-24820-2-git-send-email-caglar@pardus.org.tr> <1205746593-24820-3-git-send-email-caglar@pardus.org.tr> <1205746593-24820-4-git-send-email-caglar@pardus.org.tr> <1205746593-24820-5-git-send-email-caglar@pardus.org.tr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1860 Lines: 49 The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly Cc: netdev@vger.kernel.org Cc: Andrew Morton Signed-off-by: S.Çağlar Onur --- drivers/net/ax88796.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c index 194949a..0f823d7 100644 --- a/drivers/net/ax88796.c +++ b/drivers/net/ax88796.c @@ -11,6 +11,7 @@ * published by the Free Software Foundation. */ +#include #include #include #include @@ -151,7 +152,7 @@ static void ax_reset_8390(struct net_device *dev) /* This check _should_not_ be necessary, omit eventually. */ while ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) { - if (jiffies - reset_start_time > 2*HZ/100) { + if (time_after(jiffies, reset_start_time + 2 * HZ/100)) { dev_warn(&ax->dev->dev, "%s: %s did not complete.\n", __FUNCTION__, dev->name); break; @@ -287,7 +288,7 @@ static void ax_block_output(struct net_device *dev, int count, dma_start = jiffies; while ((ei_inb(nic_base + EN0_ISR) & ENISR_RDC) == 0) { - if (jiffies - dma_start > 2*HZ/100) { /* 20ms */ + if (time_after(jiffies, dma_start + 2 * HZ/100)) { /* 20ms */ dev_warn(&ax->dev->dev, "%s: timeout waiting for Tx RDC.\n", dev->name); ax_reset_8390(dev); -- 1.5.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/