From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753145AbaEUUIy (ORCPT ); Wed, 21 May 2014 16:08:54 -0400 Received: from mout.gmx.net ([212.227.15.19]:51681 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752098AbaEUUIx (ORCPT ); Wed, 21 May 2014 16:08:53 -0400 From: =?UTF-8?q?Manuel=20Sch=C3=B6lling?= To: isdn@linux-pingi.de Cc: manuel.schoelling@gmx.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] mISDN: Use time_before() Date: Wed, 21 May 2014 22:08:47 +0200 Message-Id: <1400702928-29110-1-git-send-email-manuel.schoelling@gmx.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <537CFE29.7050100@cogentembedded.com> References: <537CFE29.7050100@cogentembedded.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:GNbDanX4LEx8giiBPPtKbRe6A0vXXWW6rDmXjHFfVdVWYTifspl /U4po97hIF+QuIWHZZdZK1G9j3xrg+jcA8js/l9W4YoCG1ZoEn/FrdBxCGJOuSVnDJ26GMs vjCqtqVDfVizAxxFtnndgmjXnVY8aA3k7m9Q72uuFsMTIA40fwdxa4gSHaoyJaPut0Dpyne Ooe2z/U1MUDeFIYLFI0bg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To be future-proof and for better readability the time comparisons are modified to use time_before() instead of plain, error-prone math. Signed-off-by: Manuel Schölling --- drivers/isdn/mISDN/l1oip_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index 2c0d2c2..084f936 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c @@ -287,7 +287,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, p = frame; /* restart timer */ - if ((int)(hc->keep_tl.expires-jiffies) < 5 * HZ) { + if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ)) { del_timer(&hc->keep_tl); hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ; add_timer(&hc->keep_tl); @@ -621,7 +621,7 @@ multiframe: goto multiframe; /* restart timer */ - if ((int)(hc->timeout_tl.expires-jiffies) < 5 * HZ || !hc->timeout_on) { + if (time_before(hc->timeout_tl.expires, jiffies + 5 * HZ) || !hc->timeout_on) { hc->timeout_on = 1; del_timer(&hc->timeout_tl); hc->timeout_tl.expires = jiffies + L1OIP_TIMEOUT * HZ; -- 1.7.10.4