]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ioat: Use time_before_jiffies()
authorManuel Schölling <manuel.schoelling@gmx.de>
Thu, 22 May 2014 20:11:06 +0000 (22:11 +0200)
committerDan Williams <dan.j.williams@intel.com>
Thu, 21 Aug 2014 18:39:22 +0000 (11:39 -0700)
To be future-proof and for better readability the time comparisons are modified
to use time_before_jiffies() instead of plain, error-prone math.

Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
[djbw: use time_before_jiffies() to make argument order more clear]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/dma/ioat/dma_v2.c

index 8d1058085eeb85beb3fb2d6ab88c57160ef0cf15..2ce9be498608a4448246acc2a2a8da5c2cefc4de 100644 (file)
@@ -735,7 +735,8 @@ int ioat2_check_space_lock(struct ioat2_dma_chan *ioat, int num_descs)
         * called under bh_disabled so we need to trigger the timer
         * event directly
         */
-       if (jiffies > chan->timer.expires && timer_pending(&chan->timer)) {
+       if (time_is_before_jiffies(chan->timer.expires)
+           && timer_pending(&chan->timer)) {
                struct ioatdma_device *device = chan->device;
 
                mod_timer(&chan->timer, jiffies + COMPLETION_TIMEOUT);