From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753302AbaDWAq0 (ORCPT ); Tue, 22 Apr 2014 20:46:26 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:46321 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751898AbaDWAqZ (ORCPT ); Tue, 22 Apr 2014 20:46:25 -0400 X-Sasl-enc: wYiw1sQ3CCkneKj4HexYP4XTVuWwoV+OYUPTe03Dll+O 1398213984 Message-ID: <53570D41.5010401@fastmail.fm> Date: Wed, 23 Apr 2014 08:45:53 +0800 From: Michalis Pappas User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Dan Carpenter , Greg KH CC: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] staging: gdm72xx: Removed direct comparisons on jiffies References: <532BF9B0.2080008@fastmail.fm> <20140418225229.GA28077@kroah.com> <53534051.2020504@fastmail.fm> <53534116.3040705@fastmail.fm> <20140422093743.GC26890@mwanda> <53570BAA.3080709@fastmail.fm> In-Reply-To: <53570BAA.3080709@fastmail.fm> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replaced comparisons on jiffies values with wrap-safe functions. Signed-off-by: Michalis Pappas --- drivers/staging/gdm72xx/gdm_usb.c | 2 +- drivers/staging/gdm72xx/sdio_boot.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c index 20539d8..9ddf8f5 100644 --- a/drivers/staging/gdm72xx/gdm_usb.c +++ b/drivers/staging/gdm72xx/gdm_usb.c @@ -730,7 +730,7 @@ static int k_mode_thread(void *arg) spin_unlock_irqrestore(&k_lock, flags2); expire = jiffies + K_WAIT_TIME; - while (jiffies < expire) + while (time_before(jiffies, expire)) schedule_timeout(K_WAIT_TIME); spin_lock_irqsave(&rx->lock, flags); diff --git a/drivers/staging/gdm72xx/sdio_boot.c b/drivers/staging/gdm72xx/sdio_boot.c index cbe5dcf..2c02842 100644 --- a/drivers/staging/gdm72xx/sdio_boot.c +++ b/drivers/staging/gdm72xx/sdio_boot.c @@ -41,11 +41,11 @@ static u8 *tx_buf; static int ack_ready(struct sdio_func *func) { - unsigned long start = jiffies; + unsigned long wait = jiffies + HZ; u8 val; int ret; - while ((jiffies - start) < HZ) { + while (time_before(jiffies, wait)) { val = sdio_readb(func, 0x13, &ret); if (val & 0x01) return 1; -- 1.7.12.1